Close #34, Close #42
Merge branch 'master' of https://github.com/OpenUHClassScheduleHelper/OpenUHClassScheduleHelper

Conflicts:
	conf/routes