Signed-off-by: zhaoqishi <shizhaoqi@126.com>
Merge branch 'master' of https://github.com/fourone1111/DryEtchUI

# By skyxiao (92) and fourone1111 (7)
# Via fourone1111 (6) and skyxiao (1)
* 'master' of https://github.com/fourone1111/DryEtchUI: (99 commits)
  Signed-off-by: skyxiao <564198174@qq.com> skyxiao
  Signed-off-by: skyxiao <564198174@qq.com> skyxiao
  Signed-off-by: skyxiao <564198174@qq.com> skyxiao
  Signed-off-by: skyxiao <564198174@qq.com> skyxiao
  Signed-off-by: skyxiao <564198174@qq.com> skyxiao
  update gasbox image
  ignore parameters.json
  update ads config, xml and gasbox image
  Signed-off-by: skyxiao <564198174@qq.com> skyxiao
  Signed-off-by: skyxiao <564198174@qq.com> skyxiao
  Signed-off-by: skyxiao <564198174@qq.com> skyxiao
  Signed-off-by: skyxiao <564198174@qq.com> skyxiao
  Signed-off-by: skyxiao <564198174@qq.com> skyxiao
  Signed-off-by: skyxiao <564198174@qq.com> skyxiao
  Signed-off-by: skyxiao <564198174@qq.com> skyxiao
  Signed-off-by: skyxiao <564198174@qq.com> skyxiao
  Signed-off-by: skyxiao <564198174@qq.com> skyxiao
  Signed-off-by: skyxiao <564198174@qq.com> skyxiao
  Signed-off-by: skyxiao <564198174@qq.com> skyxiao
  Signed-off-by: skyxiao <564198174@qq.com> skyxiao
  ...

Conflicts:
	.gitignore
	ACM/node-webkit/config/parameters.xml
	ACM/node-webkit/config/systemdata.xml
	ACM/page/Default.htm
	ACM/page/menu.htm
Signed-off-by: zhaoqishi <shizhaoqi@126.com>