Merge branch 'master' of github.com:enter-the-bot/minava into deploy

Conflicts:
	blogengine/views.py
	minava_blog/settings.py