nada de novo
Merge branch 'master' of https://github.com/Manhazito/LMUL

Conflicts:
	BondPoint/AndroidManifest.xml
	BondPoint/bin/AndroidManifest.xml
	BondPoint/bin/BondPoint.apk
	BondPoint/bin/classes.dex
	BondPoint/bin/dexedLibs/android-support-v4-2d24129dcb9ddff4b0bf52583737909c.jar
	BondPoint/bin/dexedLibs/facebooksdk-05d44f0418ede56bb259334674e4fdfb.jar
	BondPoint/bin/dexedLibs/google-play-services_lib-8f449eece0bbf7b13e824032aadf0de0.jar
	BondPoint/bin/jarlist.cache
	BondPoint/bin/resources.ap_