Add factory_girl gem
Add factory_girl_rails gem
Include factory_girl factories+methods in all specs
Stub factories for all models
City and user basic factories
Remove factory_girl README line from generated factories
Merge branch 'factory-girl-and-friends'

Conflicts:
	Gemfile.lock