renamed bonus to home templates
Merge remote-tracking branch 'origin/master'

Conflicts:
	budgetApp/.cache
	budgetApp/conf/routes
commit fix