added icon options to popup
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/wmw24/sasasightsee/client/Popup.java