added invite_email and added tests for mailer
Added test to user_spec, fixed join method in user model
Fixes to pr comments
Merge branch 'calendar_2'
resolved merge conflights