EasonDemo
结构更改beta1
a
Merge branch 'master' of https://github.com/PhoenixJohnson/Manner-Webapp

Conflicts:
	web/ui/js/app.js
Bug fix
+EasonDemo4 like http://www.highcharts.com/
add missing files
Bug fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	web/ui/js/app.js
Bug fix
Bug fix
UI 优化
UI 优化
UI 优化
UI 优化
test
Bug fix
Merge remote-tracking branch 'origin/master'
Add Calendar plugin
Add Calendar plugin