Add Category and GpxFilename to PQ Import
Merge branch 'master' of https://github.com/Ging-Buh/cbserver

Conflicts:
	CB_Server/src/cb_server/CacheboxServer.java