comentarios
Merge branch 'develop' of https://github.com/Guillelon/AxAndroid into develop

Conflicts:
	src/com/guillelon/axdirectory/Splash.java