BULK COMMIT: MERGING THE GITORIOUS WITH GITHUB
[tool.server] new script to automate server merge and guid; updated iOS path in compile_definition_file.php  [map.server] added floor and category fields as provided by EPFL map API
Merge branch 'master' of https://github.com/PocketCampus/pocketcampus
Merge branch 'master' of https://github.com/PocketCampus/pocketcampus into ios_client_2.0