d
d
Merge branch 'master' of https://github.com/ngotuan12/AssetManagement

Conflicts:
	AssetWebapp/myapp/templates/asset/decrement-asset.html
Merge branch 'master' of https://github.com/ngotuan12/AssetManagement

Conflicts:
	AssetWebapp/myapp/templates/report/report-verify-asset.html
	AssetWebapp/myapp/templates/report/report-verify-report-summarize.html