merged from ba/generate_models
ran bundle and migrate