update configuration and gems
add migrations and models
recommit
recommit
recommit
Merge branch 'generate-models'

Conflicts:
	.c9/metadata/tab0
recommit