1st test commit
2de test commit
profilepage test content
Added bootstrap to login
Add documentation and slides
Merge origin/master

Conflicts:
	ResortUI/src/main/webapp/common/template.xhtml