Merge branch 'master' of github.com:varlal/php_manager

Conflicts:
	php/db/db_manager.php
Merge branch 'master' of github.com:varlal/php_manager