API internals, to the point of highlighting assets
Merge branch 'master' into api

Conflicts:
	eve-map/src/evemap/Program.java
characters control panel