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

Conflicts:
	AssetWebapp/AssetWebapp/urls.py