Kolka for fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	view/lustration.php
Merge remote-tracking branch 'origin/master'
Kolka for fix