1022
Merge branch 'master' of https://github.com/liuin/eplus3

Conflicts:
	editplus_u.ini
	workspace_u.ini