bug fixes for manger pages (not all but most)
Merge remote-tracking branch 'origin/master'

Conflicts:
	WebContent/META-INF/context.xml