Merge remote-tracking branch 'upstream/master' into DOC_PROJECTAPP

Conflicts:
	app/controllers/ProjectApp.java
	test/controllers/ProjectAppTest.java
Merge branch 'DOC_PROJECTAPP' of https://github.com/wansoon/hive into DOC_PROJECTAPP