Renamed messages -> messaging to prevent future clashes with django.messages
Merge branch 'feature/email' of github.com:HelloLily/hellolily into feature/email

Conflicts:
	lily/messaging/email/forms.py
	lily/messaging/email/views.py