Merge remote-tracking branch 'origin/development' into development

Conflicts:
	config/routes.rb
	db/schema.rb
Merge remote-tracking branch 'origin/development' into development

Conflicts:
	config/routes.rb
	db/schema.rb
fixed genres_controller_test; edited genres views; added photo resize to uploader