fixed logic in expiration alert email methods
Merge branch 'development' of https://github.com/simensta/refrigeratory into development
changes to user invite logic, including user model method
Merge branch 'development' of github.com:simensta/refrigeratory into development
fixed merge conflict