Merge origin/master

Conflicts:
	src/java/controller/MainController.java
	web/layout/navigation.jspf
Merge origin/master

Conflicts:
	src/java/controller/MainController.java
	src/java/model/UserMeta.java