fixed migration
Merge branch 'develop' into staging

Conflicts:
	db/migrate/20140729144502_create_option_nodes_for_optionings.rb