merge
Merge branch 'master' of https://github.com/sudov/okra

Conflicts:
	static/js/main.js