Merge branch 'angular-attachments' into angular
Merge branch 'angular' of https://github.com/loomio/loomio into angular
Merge branch 'group-settings-form' into angular

Conflicts:
	lineman/app/css/vote_form.scss
	lineman/app/templates/vote_form.haml
Merge branch 'angular' of https://github.com/loomio/loomio into angular

Conflicts:
	lineman/app/css/vote_form.scss
Order groups by full name in search dropdown