admin portal测试使用angularjs
delete
Merge branch 'master' of https://github.com/oneryx/myerp

Conflicts:
	src/com/myerp/Config.java