Added a newer version of git in .travis.yml
Merge branch 'master' of https://github.com/stereolux/sensorsbox-server

Conflicts:
	.travis.yml