0.9.2
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	app/views.py
0.9.1