Added templates
Merge branch 'dev'
Merge branch 'dev'
Cleaned up migrations
Added remaining template
Merge branch 'dev'
Added admin
Merge branch 'master' into live
Fixed categories templaes and removed unnecessary css file
Script to clean up database migrations
Merge branch 'master' into live

Conflicts:
	static/educate/educate.css
Merge branch 'live' of https://github.com/timbarnes/QandAWeb into live