Refactor angular.elements to directives
Merge branch 'linkCatToSchem' of https://github.com/nghiank/ComOn into linkCatToSchem

Conflicts:
	public/js/directives.js
	public/views/Catalog/catalogList.html
fix merge error in directives