Refactor Group#add_member! method.
Merge branch 'master' of https://github.com/enspiral/loomio into refactor/forms
refactoring in motion.rb
if/end replaced with return
fix failing spec
remove redundant method
remove redundant method calls
Merge pull request #436 from enspiral/refactor/forms

clean up form css
updated env
remove redundant spec
Merge branch 'master' into refactor/open-close-motion

* master: (45 commits)
  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
  Set helper bot to open help in new tab.
  Fix failing spec.
  remove display none
  Added migration to regenerate usernames
  Add sort by motions to admin panel
  Add sort by discussions to admin panel
  Add private groups to rake task stats:groups
  ...

Conflicts:
	app/models/motion.rb
fix button alignment in modals
Merge pull request #435 from enspiral/refactor/open-close-motion

Refactor motion.rb
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.