Agregados ejemplos usando resourse and resolve
Merge branch 'master' of github.com:fabianrios/hrs_frontend

Conflicts:
	src/app/companies/companies.js
	src/app/companies/company.tpl.html