added test ajax request
Merge remote-tracking branch 'origin/master' into server
Merge branch 'master' into server

Conflicts:
	client/main.js
added hub
Music! Using music of 0ad... press M on the keyboard to mute >_<
Error sound when trying to place building on invalid place
Removed css declaration that gave annoying warning in google chrome
Merge remote-tracking branch 'origin/sound'
Lowered the default value of the music. It was driving me bonkers. Also implemented building selection sounds! (again, hard to demonstrate/test  because the GUI doesnt know which building is selected)
Fixed merge conflict
Merge branch 'master' of https://github.com/BSG-TUDelft/Utopolis into sound
Building selection now works!
Show maximum amount of assignable citizens in context menu
Context menu shows revenue of building. This was in there before but got erased due to fixing merge error.
Fixed a bug where the selected state of the icon would not persist
Implemented a console. It shows you feedback whenever you started construction of a building
Added library
Turning the music off will now be state persistent using a cookie. Meaning if you turn it off once it wont go on automatically the next time you play (which is super nice if you're developing and getting real nervous of this music)
Console shows feedback for enabling/disablign music
Merge remote-tracking branch 'origin/teacher-interface'