uih
Merge branch 'master' of https://github.com/miccerisier/gps

Conflicts:
	common/Database.cpp