Merge branch 'master' of https://github.com/MykolaShevchuk/girko.git

Conflicts:
	girko/girko/views.py