Merge branch 'origin/master'
fix
Merge branch 'origin/master'

Conflicts:
	libs/CBaseController.php
Merge branch 'origin/master'
Merge branch 'origin/master'
Merge branch 'origin/master'
add SQL
Merge branch 'origin/master'
Merge remote-tracking branch 'refs/remotes/origin/maks_fix'