edit
Merge branch 'dev' of https://github.com/rinand/microblog into dev

Conflicts:
	app/views.py