Added migrations. First MySQL commit from live
CSS update
Merge branch 'live' of http://github.com/timbarnes/QandAWeb into live
Cleanup css files
Minor fixes to prepare for sync with dev - taggit, pyMySQL, collectstatic
Added css file
Added static files
Merge branch 'master' into live

Conflicts:
	educate/migrations/0001_initial.py
	manage.py
	static/educate.css
	static/educate/educate.css
Added static files
Merge branch 'dev' into live

Conflicts:
	static/admin/js/SelectBox.js
	static/admin/js/SelectFilter2.js
	static/admin/js/actions.js
	static/admin/js/actions.min.js
	static/admin/js/admin/DateTimeShortcuts.js
	static/admin/js/admin/RelatedObjectLookups.js
	static/admin/js/calendar.js
	static/admin/js/collapse.js
	static/admin/js/collapse.min.js
	static/admin/js/core.js
	static/admin/js/inlines.js
	static/admin/js/inlines.min.js
	static/admin/js/jquery.init.js
	static/admin/js/jquery.js
	static/admin/js/jquery.min.js
	static/admin/js/prepopulate.js
	static/admin/js/prepopulate.min.js
	static/admin/js/timeparse.js
	static/admin/js/urlify.js
database fixes
Merge branch 'dev' into live
Added missing templates from dj
Added admin
Merge branch 'master' into live
Merge branch 'master' into live

Conflicts:
	static/educate/educate.css
Merge branch 'live' of https://github.com/timbarnes/QandAWeb into live
css
Fiddling with css
Added base static dir