i18n
Merge branch 'master' of https://github.com/andriykohut/LV-090_LAMP

Conflicts:
	web/ipconflux/locale/uk/LC_MESSAGES/django.mo
i18n shanges
Merge branch 'master' of https://github.com/andriykohut/LV-090_LAMP