nuevo
Merge branch 'master' of https://github.com/cegimo/Atom

Conflicts:
	src/js/boot.js
Merge branch 'master' of https://github.com/cegimo/Atom
new merge
salto y impacto