Merge branch 'master' into feature/intranet-homepage
Merge branch 'master' into feature/intranet-homepage
Merge branch 'master' into feature/intranet-homepage
Merge branch 'master' into feature/intranet-homepage

Conflicts:
	commons-juzu-ajax-sample/pom.xml
Merge branch 'master' into feature/intranet-homepage
Merge branch 'feature/intranet-homepage'
Merge branch 'master' into feature/navigation