no change
Merge github.com:cojalvo/CampusInProject

Conflicts:
	GoogleMapProject/bin/res/drawable-hdpi/navigate_img.png
adding the QR scanner capability, maped the location with the XML, add
Random algoritem to calc the marker position, save the location to the
cloud, all work good bo bugs!