Merge branch 'master' of github.com:enspiral/loomio

* '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.
Conditional membership check added to update methods in model
Undo previous feature changes
more changes to undo
Change quote type
Set discussion_last_viewed_at with 'before_validation' callback

Removed from update method
make clear activity happen for non group members
refactor methods
Ruby refactoring
failing spec
Merge branch 'master' into bug/clear-vote-history-v2

* master: (66 commits)
  Update paperclip gem.
  Force ssl.
  Switch various assets over to https.
  Update Rails to 3.2.11
  Fix failing specs.
  mark failing specs as pending
  Try to fix failing specs for travis.
  Fixed failing specs
  Make mail for new_comment and new_vote ascyncronous
  migration to new actimity format
  Started migration implementation
  Fix failing cucumber specs
  remove motion mailer spec as it is covered with cuc
  Dynamic bind for new comments
  motion close cuc feature update
  Pull request fixes
  Request markdown specs now need to revisit page
  motion.rb refactored
  remove redirect spec for add comment
  Change post to put on motion close
  ...

Conflicts:
	app/models/discussion.rb
Remove Discussion#closed_motion
Start adding test.
Merge branch 'master' into bug/clear-vote-history-v2

* master:
  Improve guard & spork settings.
  redirect_to previous page after sign_in
Add tests.
Remove focus tag.
Merge branch 'master' into bug/clear-vote-history-v2

* master:
  Add focus tag for rspec.
Add tests.
Tiny change.
Merge pull request #439 from enspiral/bug/clear-vote-history-v2

Bug/Vote activity count not clearing for parent group members on group page for subgroups