Merge branch 'devel' of codecrew.fi:bortal into devel

code/MoyaBeans/ejbModule/fi/codecrew/moya/beans/MenuBean.java

@@ -74,7 +74,7 @@ public class MenuBean implements MenuBeanLocal {
 		logger.info("Initializing new default menu");
 		LanEvent ev = eventbean.getCurrentEvent();
 
-		MenuNavigation usermenu = new MenuNavigation(ev, "topmenu.user", 40);
+		MenuNavigation usermenu = new MenuNavigation(ev, "topmenu.user", 5);
 
 		usermenu.addPage(menuitemfacade.findOrCreate("/frontpage"), UserPermission.ANYUSER);
 		usermenu.addPage(menuitemfacade.findOrCreate("/permissionDenied"), null).setVisible(false);

code/MoyaWeb/src/fi/codecrew/moya/web/cdiview/menu/MenuView.java

@@ -91,7 +91,7 @@ public class MenuView {
 		//		logger.info("Executed menuchange-eventlistener for menuChange {} newval {}", menuChange, e.getNewValue());
 		menuChange = e.getNewValue().toString();
 		layoutview.setPageName(menuChange);
-		navihandler.forward(menuChange);
+		navihandler.forward(menuChange + "?faces-redirect=true");
 		//		super.navihandler.forward(menuChange);
 	}