Create userContent
Merge remote-tracking branch 'origin/Develop' into Develop

Conflicts:
	src/main/java/rtc/app/controllers/UserController.java
	src/main/java/rtc/app/controllers/UserNavController.java
	src/main/webapp/resources/messages_en.properties