Merge remote-tracking branch 'origin/master' into cardlessIncomingView

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

@@ -184,7 +184,7 @@ public class MenuBean implements MenuBeanLocal {
 		MenuNavigation tournaments = usermenu.addPage(null, null);
 		tournaments.setKey("tournaments.menutitle");
 		tournaments.addPage(menuitemfacade.findOrCreate("/tournaments/index"), TournamentPermission.VIEW);
-		tournaments.addPage(menuitemfacade.findOrCreate("/tournaments/myparticipations"), TournamentPermission.VIEW);
+		tournaments.addPage(menuitemfacade.findOrCreate("/tournaments/myparticipations"), TournamentPermission.PARTICIPATE);
 		tournaments.addPage(menuitemfacade.findOrCreate("/tournaments/showrules"), TournamentPermission.VIEW).setVisible(false);
 		tournaments.addPage(menuitemfacade.findOrCreate("/tournaments/participate_single"), TournamentPermission.PARTICIPATE).setVisible(false);
 		tournaments.addPage(menuitemfacade.findOrCreate("/tournaments/participate_multi"), TournamentPermission.PARTICIPATE).setVisible(false);

code/moya-web/WebContent/resources/templates/moyav2/js/main.js

+/**
+ * Created by ossi on 8.12.2014.
+ */
+
+$ = jQuery;
+
+$(document).ready(function() {
+
+   $('#open-user-login').click(function() {
+    $('#not-logged').slideToggle(300);
+    $(this).toggleClass('active');
+   });
+
+ });
\ No newline at end of file