New: draft version of email messages
Workstation change
Fix: git ignore the .idea folder of pycharm
Overhaul on the messaging app
Fix: rename of connector class, added django-fields to requirements
Fix: docstrings
New: added attachment model and made model a bit cleaner and more finished-like
prepare for merge with develop
Fix: merge new template system and other new gimmicks into this branch
Nothing to commit: making preparations for presentation
merge with develop
New: development procfile so startup is more easy
fixed: procfile no longer starts redis server, git now ignores celery pid file
Merge remote-tracking branch 'origin/develop' into feature/email

Conflicts:
	.gitignore
	lily/settings.py
	lily/static/css/core/core.css
	lily/static/js/core/mws.js
	lily/templates/base_app.html
	requirements.txt
Tag you're it! Cornelis gaat nu verder werken hieraan.
Fixed: apparently uncommited files...
Change: sorted migration dependencies for automated migration: syncdb + migrate will do to get up to speed.
Change: sorted migration dependencies for automated migration: syncdb + migrate will do to get up to speed.
Merge branch 'feature/email' of github.com:HelloLily/hellolily into feature/email
Update: progress so far since I will not be in the office next week