Remove services not used in 2.10.x + angular editor
Remove log4j.xml add wro logging to log4j.cfg
Remove irrelevant buttons from top of the editor
Add some formatting to the about.text message
Merge remote-tracking branch 'upstream/2.10.x' into 2.10.x

Conflicts:
	web/src/main/webapp/WEB-INF/classes/log4j.xml