Actividades agregar
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	.sencha/app/build.properties
	app/controller/phone/Menu.js
	app/view/phone/login/LoginForm.js