mozilla
Merge branch 'master' of https://github.com/gustavengstrom/gpsgate

Conflicts:
	index.html