changed test
Merge branch 'createNewStd' of https://github.com/nghiank/ComOn into createNewStd

Conflicts:
	public/js/controllers/upload.js
merge & fix