email templates
Merge branch 'master' of github.com:grunskis/groupie

Conflicts:
	groupie/app/forms.py
Merge branch 'master' of github.com:grunskis/groupie
Merge branch 'master' of github.com:grunskis/groupie
email template fix