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

Conflicts:
	test/karma/karma.conf.js
	test/karma/unit/controllers/addComp.spec.js