e2 c style to lua style
Merge remote-tracking branch 'upstream/master' into luastyle

Conflicts:
	lua/wire/client/e2descriptions.lua
	lua/wire/client/wire_expression2_editor.lua