data
Merge branch 'master' of https://github.com/jesusiglesiasneira/GALAXY

Conflicts:
	js/app/data.js
Merge branch 'master' of https://github.com/jesusiglesiasneira/GALAXY
data