Merge "removed wrong contacts, added authors" into tizen

diff --cc location/include/location-types.h
Simple merge

diff --cc location/manager/location-batch.c
index ed4c366,d4acd47..d4acd47
mode 100644,100755..100644
--- 1/location/manager/location-batch.c
--- 2/location/manager/location-batch.c
+++ b/location/manager/location-batch.c

diff --cc location/manager/location-gps.c
index 611d7ce,f1ab1ac..1247d1c
mode 100644,100755..100644
--- 1/location/manager/location-gps.c
--- 2/location/manager/location-gps.c
+++ b/location/manager/location-gps.c

diff --cc location/manager/location-hybrid-mobile.c
index 3ad0150,ab5c4ea..54e0630
mode 100644,100755..100644
--- 1/location/manager/location-hybrid-mobile.c
--- 2/location/manager/location-hybrid-mobile.c
+++ b/location/manager/location-hybrid-mobile.c

diff --cc location/manager/location-ielement.c
index acc0339,8a8cc64..ea7ff76
mode 100644,100755..100644
--- 1/location/manager/location-ielement.c
--- 2/location/manager/location-ielement.c
+++ b/location/manager/location-ielement.c

diff --cc location/manager/location-ielement.h
Simple merge

diff --cc location/manager/location-passive.c
index 6c3cb80,4bf8b12..4786c0c
mode 100644,100755..100644
--- 1/location/manager/location-passive.c
--- 2/location/manager/location-passive.c
+++ b/location/manager/location-passive.c

diff --cc location/manager/location-satellite.c
index 427314b,637d295..637d295
mode 100644,100755..100644
--- 1/location/manager/location-satellite.c
--- 2/location/manager/location-satellite.c
+++ b/location/manager/location-satellite.c

diff --cc location/manager/location-signaling-util.c
index bc96db2,7f5ea8a..7f5ea8a
mode 100644,100755..100644
--- 1/location/manager/location-signaling-util.c
--- 2/location/manager/location-signaling-util.c
+++ b/location/manager/location-signaling-util.c

diff --cc location/manager/location-wps.c
index 7881851,508c6fa..99c0458
mode 100644,100755..100644
--- 1/location/manager/location-wps.c
--- 2/location/manager/location-wps.c
+++ b/location/manager/location-wps.c

diff --cc location/manager/location.c
index 3417abd,b0ea74a..a994b79
mode 100644,100755..100644
--- 1/location/manager/location.c
--- 2/location/manager/location.c
+++ b/location/manager/location.c

diff --cc location/manager/location.h
index e3ca65a,eb949ad..b9e1055
mode 100644,100755..100644
--- 1/location/manager/location.h
--- 2/location/manager/location.h
+++ b/location/manager/location.h

diff --cc location/module/location-module.h
Simple merge

diff --cc location/module/module-internal.c
Simple merge

diff --cc location/module/module-internal.h
Simple merge