qrcode test and batch page
Merge branch 'master' of github.com:yanghua/FixedAssetManager_Server

Conflicts:
	proxy/fixedAsset.js
	test/controllers/fixedAsset.js
	views/subviews/batchCreate.html