Smarter 'jit' loading (including slick ajax spinner thing. party like its web 2.0)
Merge branch 'master' into premerge

Conflicts:
	client/main.js
Fixed merge errors
Merge branch 'master' of https://github.com/BSG-TUDelft/Utopolis into allmerged
Merge pull request #134 from BSG-TUDelft/allmerged

Allmerged