Moved DB pass to config file
Merge branch 'master' of github.com:jamesread/solutionBuilder

Conflicts:
	common.php