jqueryUI stuff
Merge remote-tracking branch 'origin/exp_encap' into exp_encap

Conflicts:
	company_graphic.html
update with merge