123
123
Merge branch 'master' of https://github.com/dpark1985/BuildingERP.git

Conflicts:
	views/detailView.html