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.
Dropdown menu fixed and content related to active tab added
Merge remote-tracking branch 'origin/tom-working' into feature-ui

Conflicts:
	core/migrations/0001_initial.py
	core/models.py
Update README.md
Cleaned up models and fixed imports
Fix circular import issues and model stuff
Merge remote-tracking branch 'origin/feature-ui' into beta

Conflicts:
	core/views.py
Fix models, add to string methods  and add admin site
Created skeleton for tickets list Ajax (backend) function
Backend for initial sidebar tickets api call - still to fix url
DOM elements IDs changed
Fixed padding button group
Merge ssh://github.com/darrenburns/TeamProject3 into feature-ui
Fixed conflict
Merge remote branch 'origin/feature-ui' into feature-ui
Initial API for projects