Merge pull request #162 from se1-1314/youssefbranch

Youssefbranch
Save locale in database
Made the dictionary file not look horrendous
Almost ready, url for current_schedule needs work
url for schedule fixed
Translate menubar
Translation annotations in classroom-edit
Added some translations
Merge remote-tracking branch 'origin/master' into nilsbranch

Conflicts:
	src/xiast/core.clj
Merge remote-tracking branch 'refs/remotes/origin/master' into calendar-refactor
Query+API: Edit and add rooms
Merge remote-tracking branch 'origin/master' into nilsbranch
Updated classroom-edit
Merge remote-tracking branch 'origin/master' into youssefbranch

Conflicts:
	resources/public/js/generic_calendar.js
	resources/templates/classroom-edit.html
	src/xiast/core.clj
Fixed display of blocks in schedule proposal
Merge branch 'master' of github.com:se1-1314/xiast
Update classroom-edit
Updated generic calendar js
Finished schedules for guest