xiu
Merge branch 'master' of https://github.com/qianshui/qianshui.git
Merge branch 'master' of https://github.com/qianshui/qianshui.git
add detail tab panel
modify desktopinner item click parameter when reference query control
Merge branch 'master' of https://github.com/qianshui/qianshui.git

Conflicts:
	Client/WebRoot/app/controller/QueryControl.js
	Client/WebRoot/app/view/query/DesktopInner.js
	Client/WebRoot/app/view/query/DetailTab.js
Merge branch 'master' of https://github.com/qianshui/qianshui.git
Merge branch 'master' of https://github.com/qianshui/qianshui.git
Merge branch 'master' of https://github.com/qianshui/qianshui.git
fix detail list
Merge branch 'master' of https://github.com/qianshui/qianshui.git