Initial staging for economics view improvements.
Added label indicating current system and selected system, also if there are no items in a trade category.
Colour adjustments
Merge branch 'master' of github.com:Dessimat0r/pioneer into econ-improv
Bring Luomu's game msg log over from the SSP fork.
Update makefile.
Merge remote-tracking branch 'fluffyfreak/LuomuMsgLog' into msglog
fix includes to get build working
Merge branch 'master' of https://github.com/pioneerspacesim/pioneer into LuomuMsgLog
Merge branch 'master' of github.com:fluffyfreak/pioneer into LuomuMsgLog

Conflicts:
	src/StationShipViewForm.cpp
	win32/vc2010/pioneer.vcxproj.filters
	win32/vc2012/pioneer.vcxproj.filters
	win32/vc2013Express/pioneer.vcxproj.filters
Merge branch 'master' of https://github.com/pioneerspacesim/pioneer into LuomuMsgLog

Conflicts:
	src/LuaChatForm.cpp
	src/Makefile.am
	src/MarketAgent.cpp
	src/Player.cpp
	src/SpaceStation.cpp
	src/StationCommodityMarketForm.cpp
	src/StationPoliceForm.cpp
	src/StationShipEquipmentForm.cpp
	src/StationShipRepairForm.cpp
	src/StationShipViewForm.cpp
	win32/vc2012/pioneer.vcxproj
	win32/vc2013Express/pioneer.vcxproj
Fix colours after change to Color4ub.
Properly encapsulate Sector::System.
Defer assignment of faction to Sector::System until first use.
auto-commit: translation updates
auto-commit: translation updates
Merge remote-tracking branch 'lwho/faction_assignment'
Some more fixes for pedantic warnings.
Add comparison functors for SystemPath to compare by sector only and by system only.
Convert SectorCache to a template.