removed uel stuff
Merge remote-tracking branch 'upstream/master'

Conflicts:
	cfg/themes/bootstrap/templates/default.xml
small change to avoid class
tweeks to phrases