install script.
Merge branch 'master' of https://github.com/katerman/framework

Conflicts:
	app/db.php