Syncing 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