-Confiuracion de Phonegap
Merge branch 'master' of https://github.com/aleycris/LugLoc.git

Conflicts:
	config.xml