Move GPS.conf to specific because we use diffetent NTP_SERVER
Merge branch 'cm-10.1_staging' of https://github.com/TeamCanjica/android_device_samsung_u8500-common into cm-10.1_staging