refactor odx
refactor odx
Merge branch 'master' of https://github.com/hanfengzxh/ODX

Conflicts:
	odx/views/content/template/ContentView.html
	odx/views/desktop/data/DesktopWidgets.json
	odx/widget/ContentLoader.js