--- a/src/main/java/de/mpiwg/web/jsp/JSPProxy.java	Mon Dec 07 17:06:57 2015 +0100
+++ b/src/main/java/de/mpiwg/web/jsp/JSPProxy.java	Thu Dec 17 13:44:08 2015 +0100
@@ -27,6 +27,7 @@
 		logger.info("processRequest [bean= " + bean + ", action=" + action +"]");
 		
 		try{
+			
 			if(StringUtils.equals(bean, BranchPage.bean)){
 				
 				getSessionBean().getBranchPage().loadParameters(request, response);
@@ -49,7 +50,7 @@
 				return BranchPage.page;
 				
 				
-			}else if(StringUtils.equals(bean, CreateFilePage.bean)){
+			} else if(StringUtils.equals(bean, CreateFilePage.bean)){
 				
 				getSessionBean().getCreateFilePage().loadParameters(request, response);
 				
@@ -141,7 +142,8 @@
 					getSessionBean().logout();
 				}
 				
-				return "pages/home.jsp";
+				return TopicListPage.page;
+				//return "pages/home.jsp";
 				
 			}else if(StringUtils.equals(bean, SearchPage.bean)){
 				getSessionBean().getSearchPage().loadParameters(request, response);
@@ -150,6 +152,8 @@
 					getSessionBean().getSearchPage().search();
 				} else if(StringUtils.equals(action, "filter")){
 					getSessionBean().getSearchPage().filter();
+					
+				
 				//PAGINATOR
 				} else if(StringUtils.equals(action, "firstPage")){
 					getSessionBean().getSearchPage().firstPage();
@@ -285,6 +289,107 @@
 				
 				return FullTextSearchPage.page;
 				
+				
+			} else if(StringUtils.equals(bean, TopicListPage.bean)){
+				getSessionBean().getTopicListPage().loadParameters(request, response);
+							
+				if(StringUtils.equals(action, "forceLoadTopics")){
+					getSessionBean().getTopicListPage().forceLoadTopics();
+				
+				} else if(StringUtils.equals(action, "deleteTopic")){
+					getSessionBean().getTopicListPage().deleteTopic();
+				} else if(StringUtils.equals(action, "createTopic")){
+					Long userId = getSessionBean().getUser().getId();
+					getSessionBean().getTopicListPage().createTopic(userId);	
+				} 	
+		
+					
+				return TopicListPage.page;
+					
+			
+			} else if(StringUtils.equals(bean, TopicPage.bean)){
+				getSessionBean().getTopicPage().loadParameters(request, response);
+							
+				if(StringUtils.equals(action, "forceLoadTopicSectionRelation")){
+					getSessionBean().getTopicPage().forceLoadTopicSectionRelation();
+					
+				} else /* if(StringUtils.equals(action, "deleteTopic")){
+					getSessionBean().getTopicPage().deleteTopic();
+				} else if(StringUtils.equals(action, "createTopic")){
+					Long userId = getSessionBean().getUser().getId();
+					getSessionBean().getTopicPage().createTopic(userId);
+				
+				} else */ 
+				
+				if(StringUtils.equals(action, "addContributor")){
+					getSessionBean().getTopicPage().addContributor();
+				} else if(StringUtils.equals(action, "removeContributor")){
+					getSessionBean().getTopicPage().removeContributor();
+				} else if( StringUtils.equals(action ,"updateDescription")) {
+					getSessionBean().getTopicPage().updateDescription();	
+					
+				} else if( StringUtils.equals(action ,"deleteSection")) {					
+					getSessionBean().getTopicPage().deleteSection(getLongParameter("sectionId"));	
+				
+				} else if(StringUtils.equals(action, "filter")){
+					getSessionBean().getTopicPage().filter();
+			
+					
+				} else if(StringUtils.equals(action, "addSectionToTopic")) {
+					Long selectedSectionId = getLongParameter("selectedSectionId");
+					Long selectedTopicId = getLongParameter("selectedTopicId");
+					
+					getSessionBean().getTopicPage().addSectionToTopic(selectedSectionId, selectedTopicId);
+					return SearchPage.page;
+					
+					
+					
+				//SORTING
+				} else if(StringUtils.equals(action, "sortByBookIdUp")){
+					getSessionBean().getTopicPage().sortByBookIdUp();
+				} else if(StringUtils.equals(action, "sortByBookIdDown")){
+					getSessionBean().getTopicPage().sortByBookIdDown();
+				} else if(StringUtils.equals(action, "sortByBookNameUp")){
+					getSessionBean().getTopicPage().sortByBookNameUp();
+				} else if(StringUtils.equals(action, "sortByBookNameDown")){
+					getSessionBean().getTopicPage().sortByBookNameDown();
+				} else if(StringUtils.equals(action, "sortByDynastyUp")){
+					getSessionBean().getTopicPage().sortByDynastyUp();
+				} else if(StringUtils.equals(action, "sortByDynastyDown")){
+					getSessionBean().getTopicPage().sortByDynastyDown();
+				} else if(StringUtils.equals(action, "sortByPeriodUp")){
+					getSessionBean().getTopicPage().sortByPeriodUp();
+				} else if(StringUtils.equals(action, "sortByPeriodDown")){
+					getSessionBean().getTopicPage().sortByPeriodDown();
+				} else if(StringUtils.equals(action, "sortBySectionNameUp")){
+					getSessionBean().getTopicPage().sortBySectionNameUp();
+				} else if(StringUtils.equals(action, "sortBySectionNameDown")){
+					getSessionBean().getTopicPage().sortBySectionNameDown();
+				
+				} else if(StringUtils.equals(action, "sortByLevel1Up")){
+					getSessionBean().getTopicPage().sortByLevel1Up();
+				} else if(StringUtils.equals(action, "sortByLevel1Down")){
+					getSessionBean().getTopicPage().sortByLevel1Down();
+				} else if(StringUtils.equals(action, "sortByLevel2Up")){
+					getSessionBean().getTopicPage().sortByLevel2Up();
+				} else if(StringUtils.equals(action, "sortByLevel2Down")){
+					getSessionBean().getTopicPage().sortByLevel2Down();
+				
+			
+				} else if(StringUtils.equals(action, "sortByAdminTypeUp")){
+					getSessionBean().getTopicPage().sortByAdminTypeUp();
+				} else if(StringUtils.equals(action, "sortByAdminTypeDown")){
+					getSessionBean().getTopicPage().sortByAdminTypeDown();
+				
+				} else if(StringUtils.equals(action, "sortByStartPageUp")){
+					getSessionBean().getTopicPage().sortByStartPageUp();
+				} else if(StringUtils.equals(action, "sortByStartPageDown")){
+					getSessionBean().getTopicPage().sortByStartPageDown();
+				} 
+				
+				return TopicPage.page;
+					
+			
 			} else if(StringUtils.equals(bean, BooksPage.bean)){
 				getSessionBean().getBooksPage().loadParameters(request, response);
 				
@@ -385,13 +490,14 @@
 			e.printStackTrace();
 			addMsg("There is an internal error: " + e.getLocalizedMessage());
 			
-			return HomePage.page;
+			return TopicListPage.page;
+			//return HomePage.page;
 		}
 		
 	
 		//Default Page:
-		//return BooksPage.page;
-		return HomePage.page;
+		return TopicListPage.page;
+		//return HomePage.page;
 		//return "pages/search.jsp";
 	}