db
Merge branch 'master' of http://github.com/askz/dsk

Conflicts:
	www/db.php