commit to get changes
Merge remote-tracking branch 'origin/ui' into UI

Conflicts:
	src/main/java/org/guideme/guideme/model/Page.java
Changes to have one javascript per page containing functions