#12 licence with adapted comment for gsp files
#12
Merge branch 'master' of https://github.com/bakinibilel/comtrek

Conflicts:
	comtrek/grails-app/conf/DataSource.groovy
	comtrek/grails-app/domain/comtrek/Trek.groovy