Changes to asset and DB access statements
Merge branch 'master' of https://github.com/irvingtan/CS3750

Conflicts:
	Workspace/CS 3570/src/com/cs3750/asset/biz/AssetType.java