Merge remote-tracking branch 'origin/develop' into develop
fix page type
sutochno fix
Merge branch 'develop'
Merge branch 'master' of github.com:ulmic/nastachku