modified:   ../../examples/di.php
	modified:   Database.php
Merge branch 'master' of github.com:nbari/DALMP