2014-04-30, 15:47
Merge branch 'master' of https://github.com/jbaxe2/cit-server

Conflicts:
	html/plato/course_request.html
	html/plato/web/Plato.dart