Crius 1.6 update
Merge branch 'original'

Conflicts:
	eve_db/models/inventory.py
	eve_db/models/station.py