remove courses table, rename course_terms to courses
Merge branch 'master' of github.com:cs198/codepuppy

Conflicts:
	app/assets/app/partials/navigation/NavigationCtrl.js
	app/controllers/people_controller.rb