small bugs fix
Merge branch 'dev' of https://github.com/povesma/UkrYama-2.1 into dev
User Activation bug fix
Merge branch 'dev' of https://github.com/povesma/UkrYama-2.1 into dev