still working on gitignore
Merge remote-tracking branch 'origin/master'

Conflicts:
	ITAssetManager.v12.suo
	IT_Asset_Management.Web/ClientBin/IT_Asset_Management.xap