2013-12-19
Merge branch 'master' of github.com:lizhong8532/frontendConfigManager

Conflicts:
	CHANGELOG
	core.js
	doc/core.js.html
	doc/index.html
	doc/uinv.FCM.configMgr.api.html
	doc/uinv.FCM.configMgr.data.html
	doc/uinv.FCM.configMgr.form.html
	doc/uinv.FCM.configMgr.global.html
	doc/uinv.FCM.configMgr.model.array.html
	doc/uinv.FCM.configMgr.model.backup.html
	doc/uinv.FCM.configMgr.model.colorpicke.html
	doc/uinv.FCM.configMgr.model.dialog.html
	doc/uinv.FCM.configMgr.model.download.html
	doc/uinv.FCM.configMgr.model.images.html
	doc/uinv.FCM.configMgr.model.key.html
	doc/uinv.FCM.configMgr.model.layer.html
	doc/uinv.FCM.configMgr.model.monitor.html
	doc/uinv.FCM.configMgr.model.object.html
	doc/uinv.FCM.configMgr.model.panel.html
	doc/uinv.FCM.configMgr.model.resources.html
	doc/uinv.FCM.configMgr.model.selector.html
	doc/uinv.FCM.configMgr.model.statistics.html
	doc/uinv.FCM.configMgr.model.stringDB.html
	doc/uinv.FCM.configMgr.model.transform.html
	doc/uinv.FCM.configMgr.model.viewpoint.html
	doc/uinv.FCM.configMgr.msg.html
	doc/uinv.FCM.configMgr.note.html
	doc/uinv.FCM.configMgr.other.html
	doc/uinv.FCM.configMgr.template.html
	doc/uinv.FCM.configMgr_.html
	doc/uinv.FCM.configMgr_.html#translate
	images/.svn/all-wcprops
	images/.svn/entries
	templates/.svn/all-wcprops
	templates/.svn/entries
	views/.svn/all-wcprops
	views/.svn/entries
	views/.svn/text-base/index.html.svn-base
	views/.svn/text-base/layer.html.svn-base
	views/.svn/text-base/monitor.html.svn-base
	views/.svn/text-base/panel.html.svn-base