Merge pull request #243 from Somesh/master

Invitation flow modifications
Merge pull request #244 from Somesh/master

email handler changes
modified async email handler, added parametres to function
Remove unwanted whitespace
Send email when resetting password
Fix html template for invite email
added feedeback model
modified from email param
feedback initial handler
Merge remote-tracking branch 'upstream/master'
added from email