minor
Merge branch 'master' of https://github.com/orachid/yacramanager.git

Conflicts:
	src/main/webapp/assets/js/app/controllers/company-controller.js