bump
Merge branch 'master' of https://github.com/Xerrass/eveOnlineAPIFramework

Conflicts:
	src/eveApiFramework/Util/main.java