Merge branch 'develop'

Conflicts:
	index.php
fix
setting
Merge branch 'master' of https://github.com/audiua/shkolyar
Merge branch 'master' of https://github.com/audiua/shkolyar