Merge pull request #6 from pasharayan/master

Styling changes, added a nicer looking links bar, a few changes to the way simple_format is displayed, extended comment box height etc.
added /users and tweaking mailers
fixed merge conflict
add intercom app
changed intercom intializer
mailer error
fixed new_group mailer and fixed dependencies
_comment.html error
add cancan for groups/:id/users page
authorisation for admin page
changes
Merge remote-tracking branch 'upstream/master'
add pending users display page
add default reply_to for user_mailer.rb
add groups/:id/links page with routes / controller
add cancan permissions to groups#links
fixed cancan error
stops sending email to existing members of a group, if they are added twice
got rid of left bar
Merge remote-tracking branch 'upstream/master'