descr
Merge branch 'master' of https://github.com/octoberry/finzdrav
Merge branch 'master' of https://github.com/octoberry/finzdrav
Merge branch 'master' of https://github.com/octoberry/finzdrav
Merge branch 'master' of https://github.com/octoberry/finzdrav

Conflicts:
	app/views.py
Merge branch 'master' of https://github.com/octoberry/finzdrav
Merge branch 'master' of https://github.com/octoberry/finzdrav
Merge branch 'master' of https://github.com/octoberry/finzdrav
Merge branch 'master' of https://github.com/octoberry/finzdrav

Conflicts:
	app/views.py