partial commit
Merge branch 'master' into UserPlaceNew

Conflicts:
	grails-app/conf/BootStrap.groovy
fix bootstrap
Add UserPlaceRelation
generate users
regenerate place
fix serializable to composite id
fix relation name
partial commit
partial commit
small fix
Merge branch 'UserPlaceNew'
add index controller