Merge branch 'master' of github.com:loomio/loomio into refactor/discussion_css

* 'master' of github.com:loomio/loomio:
  Remove asset sync
  Revert "Refactor Google analytics inclusions"
  little grammar and layout fixes that rich hates
  Improve language for inviting people
  minor improvements to the invitation mailer defaults
  refactor css
  Refactor Google analytics inclusions
  Remove piwik until we've set it up on our own server
  Add group to group request admin page
  Acts as state machine, you little devil... :imp:
  Fix failing specs
  Add more error catching to debug funky group request stuff
  Add extra cautious save to GroupRequest#approve!
  prevent group requests from being deleted if there is a group associated
  minor changes to locale files
  minor changes to locale files
  fixes #741 by passing task to delayed_job
  character counter added to desciption field
  update pages.css

Conflicts:
	app/assets/javascripts/main.js.coffee
	app/assets/stylesheets/discussions.css.scss
	app/assets/stylesheets/group_requests.css.scss
	app/assets/stylesheets/pages.css.scss
	app/views/discussions/_form.html.haml