Added stubs, formatted code
Merge branch 'master' of github.com:chuck211991/cfg

Conflicts:
	app/controllers/ContextController.java
	app/controllers/ReviewController.java