rename, added style for popup
Merge branch 'master' of https://github.com/wolfie/PopupExtension

Conflicts:
	WebContent/META-INF/MANIFEST.MF