Refactor Group#add_member! method.
Merge branch 'master' of https://github.com/enspiral/loomio into refactor/forms
Merge pull request #436 from enspiral/refactor/forms

clean up form css
fix button alignment in modals
Merge branch 'refactor/forms' into 1.3
Merge branch 'master' of github.com:enspiral/loomio into refactor/group-add-member

* 'master' of github.com:enspiral/loomio: (32 commits)
  remove redundant spec
  updated env
  remove redundant method calls
  remove redundant method
  fix failing spec
  if/end replaced with return
  refactoring in motion.rb
  Remove failing spec.
  Remove failing specs.
  Fix little issues in the metrics rake script.
  clean up form css
  Fix regenerate_usernames migration
  Migration only regenerates existing invalid usernames, added user model stub to migration
  Fix delete bug.
  strip whitespace.
  remove most of these counter caches
  Set group emails to true by default.
  Pend out failing spec.
  Fix failing spec.
  Add step in create proposal to test content is rendering
  ...

Conflicts:
	app/models/membership.rb
	spec/requests/groups_spec.rb
Merge pull request #428 from enspiral/refactor/group-add-member

Refactor Group#add_member! methods
Merge branch '1.3'

* 1.3:
  fix button alignment in modals
Change and hide the cookie token.
Merge branch '1.3'

* 1.3:
  Change and hide the cookie token.
Fix failing specs.
Merge branch '1.3'

* 1.3:
  Fix failing specs.
Update the tooltip in the .js.erb file using 'fixTitle'

Move the instantiation of the tooltip to the pop-over.js.coffee file
Merge branch 'master' of github.com:enspiral/loomio into bug/privacy-tooltip

* 'master' of github.com:enspiral/loomio:
  Fix failing specs.
  Change and hide the cookie token.
  fix button alignment in modals
  remove redundant spec
  updated env
  remove redundant method calls
  remove redundant method
  fix failing spec
  if/end replaced with return
  refactoring in motion.rb
  Refactor Group#add_member! method.
Merge pull request #437 from enspiral/bug/privacy-tooltip

Correct the privacy tooltip to update when new setting is selected
Merge branch 'master' of github.com:enspiral/loomio into feature/refactor-activity-feed

* 'master' of github.com:enspiral/loomio:
  Update the tooltip in the .js.erb file using 'fixTitle'
  Fix failing specs.
  Change and hide the cookie token.
  fix button alignment in modals
  Refactor Group#add_member! method.
Fixed failing specs