fldkf
Merge branch 'master' of https://github.com/fourone1111/DryEtchUI

Conflicts:
	ACM/node-webkit/config/parameters.json
Merge branch 'master' of https://github.com/fourone1111/DryEtchUI
Merge branch 'master' of https://github.com/fourone1111/DryEtchUI
Merge branch 'master' of https://github.com/fourone1111/DryEtchUI
no reload