.
Merge branch 'master' of ssh://github.com/winx88/vehicle-monitor

Conflicts:
	vehicel-monitor/src/main/java/com/tracker/vehicel_monitor/App.java