fixed ordering of discussions without subgroups
ordering fixes
Engagement removed
moved reusable js to main.js
Merge branch 'master' of github.com:enspiral/loomio into feature/preview-graphs

* 'master' of github.com:enspiral/loomio: (102 commits)
  Fix failing specs.
  Vote.rb: Remove duplication.
  Add system message for notifications.
  Add signed_out? helper.
  Motion template: Add newline to end of file.
  Improve selector styling.
  Notifications: styling changes.
  Paginate notifications.
  Notifications: improve formatting.
  Bugfix: more date-related display bugs.
  Bugfix: blocked motions not display colors correctly.
  Motion form: Refactor date handling
  Fix date bug on discussion timestamps
  Fix mailer bug
  Improve notification styling
  Enable group emails.
  Fix client-side validations.
  Refactor mailer to use shared context.
  Abstract email_subject_prefix from mailers.
  Remove comments.
  ...

Conflicts:
	app/assets/javascripts/main.js.coffee
	app/assets/javascripts/motions.js.coffee
	app/assets/stylesheets/discussions.css.scss
	app/assets/stylesheets/main.css.scss
	app/helpers/discussions_helper.rb
	app/views/dashboard/show.html.haml
	app/views/groups/show.html.haml
merge errors fixed
graph previews added to motion previews
removed unused javascript and css files
remove old motion_read_log file
vote alert label added to graph previews
Merge branch 'master' of github.com:enspiral/loomio into feature/preview-graphs

* 'master' of github.com:enspiral/loomio: (42 commits)
  Fix notifications bug
  Fix migrations
  User settings: style fix.
  user.rb: Improve avatar validations.
  user.rb: Fix initials code.
  Add nokigiri to gemfile.
  Update schema
  Notifications: improve system message.
  Fix failing specs
  Notifications: fire event upon proposal creation from group page.
  initials stored in database
  formatting changes
  controller specs implemented
  refactor json responses for image update
  refactored with UserHelper
  fixed word-wrap on motion-page
  controller to redirect back on upload
  imagemagick installed
  specs writen for avaratar_url
  removed white space
  ...

Conflicts:
	app/assets/javascripts/users.js.coffee
	app/assets/stylesheets/memberships.css.scss
	db/schema.rb
change z-index of navbar to be on top
graph preview alert label repositioning
Merge branch 'master' of github.com:enspiral/loomio into feature/preview-graphs

* 'master' of github.com:enspiral/loomio:
  Fix failing specs.
  Bugfix.
  Bugfix: vote icons displaying after vote.
  Fix failing specs.
alert removed from closed motions on discussion page
files removed that were acidentally included
Merge branch 'master' of github.com:enspiral/loomio into feature/preview-graphs

* 'master' of github.com:enspiral/loomio:
  Do not add loomio helper discussion to subggroups.
  logged in user viewing public group bug
  template added for info-help
  Install cucumber.
  Auto-focus to input fields after aadd new group members/vote button press
  Fix help notice bugs.
  Improve wording language
  Fix failing tests.
  failing specs
  wording change
  seed user added
  fixed failing mailer specs
  new motion helper text added

Conflicts:
	app/assets/javascripts/groups.js.coffee
	app/assets/javascripts/votes.js.coffee
	app/views/dashboard/show.html.haml
	app/views/groups/show.html.haml
merge marker removed
added graph back in for closed motions
Markdown, may need some CSS tweaks

Codeblock fix and formatting