Added unique usernames column
Added migration to create unique usernames for all current users in db
Added at-who gem for at.js @mention functionality
Added route and action to users controller, ajax for request
Modified route, added template file for json
Added cucumber specs for @mentions
Fixed merge conflicts
Added json template for mentions, modifications to js
Work on invitations.
changes to js
Changes to discussions js
Merge branch 'master' of github.com:enspiral/loomio into feature/invite-system

* 'master' of github.com:enspiral/loomio:
  Added mini profiles to all usernames in discussion history
  Added mini profiles to the membership list
  Fixed mailto link/anything else inside popover clicking, now wont hide popover by default
  Refactoring hide/show popover into a method
  Popovers now hide and show correctly
  added some additional fixed
Merge branch 'master' of github.com:enspiral/loomio into feature/invite-system

* 'master' of github.com:enspiral/loomio:
  Improve test wording.
  Improve wording of example discussion.
  fixed list styles on context, discussion, and proposal
  text edit for tests
  included test
  fixed urls
  add mascot to group request page

Conflicts:
	app/models/group.rb
Merge branch 'master' of github.com:enspiral/loomio into feature/invite-system

* 'master' of github.com:enspiral/loomio:
  Increase capybara default wait time.
  Increase capybara default wait time.
Migration modal and code for limiting add member
undo commit mistake
more undos
header bar fix
Home page
All page working bar log in