fixed zh locale file
added auditlog from
Merge remote-tracking branch 'origin/hotfix'
removed comment
color
Merge branch 'hotfix'
fixed main menu scripts
Merge branch 'master' of github.com:araqne/webfx
fixed zh locale file
Merge remote-tracking branch 'origin/master' into hotfix

Conflicts:
	araqne-webconsole/src/main/resources/WEB-INF/locales/system.zh.json
addded system config sub menu string fo zh locale
Merge branch 'master' into uidev