Merge branch 'master' of https://github.com/PliTeX/gps-tracker-test

Conflicts:
	.gitignore
Merge branch 'master' of https://github.com/PliTeX/gps-tracker-test