Move server to the MessagingService temp ver.
Merge branch 'kshur-master'

Conflicts:
	src/com/lge/ccdevs/tracker/MonitorModeActivity.java
	src/com/lge/ccdevs/tracker/WatcherModeActivity.java