fixed user location update
Merge branch 'master' of https://github.com/skyangel3m/RideSharing

Conflicts:
	Smartride_api/include/DB_Functions.php
	Smartride_api/include/GCM_pushnotification.php
	Smartride_api/index.php