handled error on checkIfDatabaseStarted
Merge remote-tracking branch 'origin/master'

Conflicts:
	lib/server.js
handled error on checkIfDatabaseStarted