Turn Group#all_discussions into a query object.
Add discussions_query spec.
Fix broken DiscussionQuery logic.
Strip trailing whitespace.
Rename DiscussionsQuery method.
Move more queries into DiscussionsQuery.
Remove unnecessary controller logic.
Reduce capybara wait time.
Update rspec.
Move Group#discussions_sorted into DiscussionQuery

Method is now called:
DiscussionsQuery#without_current_motions
Fix bug.
Merge pull request #443 from enspiral/bug/edit-context-helper-text

Bug/edit context helper text
add markdown functionality to users, some minor css tweaks and removed a bootstrap from the Gemfile. may need to write some integration tests still and check ie7 compat.
Merge branch 'master' of github.com:enspiral/loomio

Conflicts:
	Gemfile.lock
	app/assets/stylesheets/discussions.css.scss
	app/controllers/discussions_controller.rb
	app/views/comments/_comment.html.haml
	app/views/discussions/_add_comment.html.haml
	db/schema.rb
Remove duplication in DiscussionsQuery.
add cucumber tests to comment markdown settings
Fix failing request spec.
refactor markdown-settings, ajax. write cucumber tests
cleaned out unnecessary .activity from discussions css
cleaned one like from .activity-item-body in discussions.css