Updated docs, minor bugfixes
Merge branch 'master' of github.com:vseryakov/backend
Updated docs, minor bugfixes