Merge pull request #1 from unclechu/master

Big push
Merge branch 'master' of https://github.com/web-izmerenie/usadba-parfenova