#7: added tab navigation, view stubs, controllers
#6: added location for CoursePlan
#6 Changed Bookmark to Flag
#8: added CourseController
Merge remote-tracking branch 'upstream/phase2' into phase2

Conflicts:
	mtraining/src/main/java/org/motechproject/whp/mtraining/web/domain/Bookmark.java
	mtraining/src/test/java/org/motechproject/whp/mtraining/web/controller/BookmarkControllerTest.java
Fixed unit tests after Bookmark refactorization