db.php
Merge https://github.com/knagara/jiminy

Conflicts:
	db.php
Merge https://github.com/knagara/jiminy

Conflicts:
	db.php
Merge https://github.com/knagara/jiminy
Merge https://github.com/knagara/jiminy