#18 #15 #9 #8 #21 correction of domain class and generation of basic crud
Merge branch 'master' of https://github.com/bakinibilel/comtrek

Conflicts:
	comtrek/grails-app/conf/DataSource.groovy
	comtrek/grails-app/domain/comtrek/User.groovy
	comtrek/grails-app/views/user/_form.gsp
	comtrek/grails-app/views/user/show.gsp
Merge branch 'master' of https://github.com/bakinibilel/comtrek

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