elasticsearch: "http://10.8.84.90:443",
modified:   src/config.js
add entry panel
modified:   ../dashboards/default.json
new file:   entry/editor.html
new file:   entry/module.html
new file:   entry/module.js
modified:   ../../config.js
select main/subclass when save
modified:   controllers/dashLoader.js
modified:   partials/dashLoader.html
modified:   services/dashboard.js
remove delete icon
modified:   partials/dashLoader.html
add percentiles
new file:   app/panels/percentiles/editor.html
new file:   app/panels/percentiles/module.html
new file:   app/panels/percentiles/module.js
modified:   config.js
new file:   panels/statisticstrend/editor.html
new file:   panels/statisticstrend/module.html
new file:   panels/statisticstrend/module.js
modified:   ../config.js
remove some copy form terms..
modified:   module.js
put class/mainclass/subclass to settings for saving
modified:   app/components/settings.js
modified:   app/controllers/pulldown.js
modified:   app/partials/dashLoader.html
modified:   config.js
entry panel use classed in settings
modified:   app/panels/entry/module.js
modified:   config.js
remove ctrip
add our 2 panels
modified:   app/components/settings.js
modified:   app/controllers/dashLoader.js
modified:   app/controllers/pulldown.js
modified:   app/dashboards/default.json
new file:   app/panels/entry/editor.html
new file:   app/panels/entry/module.html
new file:   app/panels/entry/module.js
new file:   app/panels/percentiles/editor.html
new file:   app/panels/percentiles/module.html
new file:   app/panels/percentiles/module.js
new file:   app/panels/statisticstrend/editor.html
new file:   app/panels/statisticstrend/module.html
new file:   app/panels/statisticstrend/module.js
modified:   app/partials/dashLoader.html
modified:   app/services/dashboard.js
modified:   config.js
use ctrip config
modified:   config.js
elasticsearch: "http://es.ops.ctripcorp.com:443"
modified:   config.js
remove ctrip ..
modified:   app/panels/entry/module.js
Merge branch 'ctripops' into ctrip

Conflicts:
	src/app/panels/entry/module.js
	src/config.js
directive('statisticstrendChart')
modified:   app/panels/statisticstrend/module.html
modified:   app/panels/statisticstrend/module.js
Merge branch 'ctrip' into ctripops

Conflicts:
	src/app/panels/entry/module.js
	src/app/panels/statisticstrend/module.html
	src/app/panels/statisticstrend/module.js
	src/config.js
merge from ctrip
modified:   app/panels/entry/module.js
modified:   app/panels/statisticstrend/module.html
modified:   app/panels/statisticstrend/module.js