Add new DB
test graph
test merge
Merge branch 'develop' into Release2

Conflicts:
	viewjob.php
remove test