Schedulr Bootstrapped
Merge

Conflicts:
	mysite/mysite/static/corman/js/controllers.js