bug fixes
Merge branch 'master' of https://github.com/itstep2014half22013/kozhukhovskayaDZ