refactored invites and user dashboard a bit
Merge remote-tracking branch 'upstream/master'