Merge branch 'master' into rtong

Conflicts:
	.target/IntegrationTest$1.class
	.target/IntegrationTest.class
	.target/models/Course.class
	.target/models/entities/ECourse.class
	.target/views/course_list.scala.html
	app/controllers/CourseController.java