Signed-off-by: greenmobile <tranelis@gmino.de>
Merge branch 'master' of https://github.com/greenmobile/cyclemap

Conflicts:
	db.php

Signed-off-by: greenmobile <tranelis@gmino.de>