test
20140622
Merge branch 'master' of https://github.com/CapsLock-Studio/TeacherComment

Conflicts:
	app/controllers/comments_controller.rb
	app/controllers/teachers_controller.rb
	config/routes.rb