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

Conflicts:
	bin-debug/DebugHostInfo.xml
	bin-debug/Vapec.swf