Add some important hints across the project
Merge remote-tracking branch 'origin/master'

Conflicts:
	onpage/pom.xml
Add important meta tags and some globalVariables based on the URL