Updated list and queries of Moods and Actividades
Merge branch 'master' of https://github.com/Betahackers/quito-frontend

Conflicts:
	app/index.html
Merge branch 'master' of https://github.com/Betahackers/quito-frontend