Merge branch 'master' of https://github.com/arturopn/Vapec_1

Conflicts:
	.actionScriptProperties
	src/views/VapecHomeView.mxml
	src/views/VapecInicioView.mxml
Merge branch 'master' of https://github.com/arturopn/Vapec_1

Conflicts:
	.actionScriptProperties
	bin-debug/Vapec.apk
	bin-debug/Vapec.swf
	src/views/VapecCoachingView.mxml
	src/views/VapecHomeView.mxml
	src/views/VapecInicioView.mxml