Subiendo datos de bd
Merge branch 'master' of https://github.com/No6things/ATICOMPANY

Conflicts:
	source/spa/app/assets/javascripts/spa.js