things happened
Merge branch 'master' of https://github.com/ilangray/massive-octo-batman

Conflicts:
	app/scripts/controllers/schedule_ctrl.js
	app/scripts/filters/search.js