Actually increment dientifier?
Merge branch 'loginline' of https://github.com/cyberkitsune/PSO2Proxy into loginline

Conflicts:
	proxy/data/ships.py