db
Merge branch 'master' of https://github.com/Mikhail-str/Improvy_new

Conflicts:
	php/db.php