trying to get tests to work
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/KikuyuController.java
	test/controllers/KikuyuControllerTest.java
header copying