Nothing
Merge branch 'master' of https://github.com/esd-soft-eng/server

Conflicts:
	MuseumServer/nbproject/project.properties
Remove Tour awww yeah
Merge branch 'master' of https://github.com/esd-soft-eng/server