Merge branch 'master' of https://github.com/goshx/node-traccar

Conflicts:
	README.md
Merge branch 'master' of https://github.com/goshx/node-traccar