Added holoemotes, work on imagedesign, bug fixes, new visitor class
Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2

Conflicts:
	src/services/EntertainmentService.java