Merge

Conflicts:
	gallery/admin.py
	gallery/models.py
	gallery/tests.py
	gallery/utils.py
	gallery/views.py
	simple_admin/models.py
	simple_admin/tests.py
	simple_admin/views.py
	slack.db
	slack/slack/settings.py
	slack/templates/500.jinja
	slack/urls.py
	static/css/base1.css
	templates/500.html
	templates/gallery/about.html
	templates/gallery/base.html
	templates/gallery/categories.html
	templates/gallery/faq.html
	templates/gallery/main.html
	templates/gallery/media_by_subcategory.html
	templates/gallery/show_subcategories.html
	templates/simple_admin/teachers.html