calibrated frontend to backend modifications
second attempt at calibrating frontend to backend modifications
Another merge

Conflicts:
	db/seeds.rb
Merge branch 'master' of github.com:coursehub/coursehub