group feature version 2 + db migrate corrected
Merge remote-tracking branch 'origin/master' into society

Conflicts:
	app/assets/javascripts/application.js
	db/schema.rb