13/5 commit
Merge branch 'master' of https://github.com/deshannalinda/enrol_planner

Conflicts:
	app/views/bootstrap/unit_chooser.html.erb