Merge branch 'master' into tom-working
Changed and updated the models, updated the README
Cleaned up file structure.
Refactored the models a little.
Removed database lock file.
Merge remote-tracking branch 'origin/tom-working' into feature-ui

Conflicts:
	core/migrations/0001_initial.py
	core/models.py