for stupid teacher from PLEXANOVKA
Merge remote-tracking branch 'origin/master'

Conflicts:
	www/application/classes/Controller/Admin/Index.php
for stupid teacher from PLEXANOVKA