Starting coding dbConnection
Merge origin/master

Conflicts:
	log/tomo.log
Merge origin/master

Conflicts:
	log/tomo.log