tracking service
Merge remote-tracking branch 'origin/master'

Conflicts:
	AndroidManifest.xml
	src/com/nth/ikiam/MainActivity.java
	src/com/nth/ikiam/MapActivity.java