vinhndq update bao cao
Merge branch 'master' of https://github.com/ngotuan12/AssetManagement
VINHNdq
vinhndq
Merge branch 'master' of https://github.com/ngotuan12/AssetManagement

Conflicts:
	AssetWebapp/AssetWebapp/urls.py
	AssetWebapp/myapp/templates/left-panel.tpl.html