first project commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	grails-app/views/layouts/layoutHome.gsp
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Admin template