add machine database interface
Merge branch 'feature/addMachineDatabaseInterface' into develop
fixed
Merge branch 'develop' of https://github.com/adamgliea/TentertainmentManagement into feature/AssetSetup

Conflicts:
	Main/main.cpp
Fix problem of showing the table.