mon 03.02
Merge branch 'master' of https://github.com/GraLucena/Uniclub.Android

Conflicts:
	Resources/alloy/controllers/listaDeComprasScreen1.js
	Resources/alloy/controllers/listaDeComprasScreen4.js
	app/controllers/catalogoScreen.js
	app/controllers/inicioScreen.js
	app/controllers/menu.js