Merge Commit
Merge branch 'master' of https://github.com/HedBye/Mobile-Project

Conflicts:
	.idea/workspace.xml
	target/Mobile-Project.war