whitelist de llamadas y sms
Merge remote-tracking branch 'origin/Browser' into Gps

Conflicts:
	HomeScreen/AndroidManifest.xml
	HomeScreen/src/com/parrasoft/launcher/LoginActivity.java