加入搜索功能
加入查询功能
Merge branch 'master' of https://github.com/xianglei/easyhadoop

Conflicts:
	EasyHadoopCentral/application/controllers/operate.php
Revert "update jquery from 1.8.3 to 1.9.1"

This reverts commit a372859e5a26ca9c3f0c9d5e4bcb2a2aff9f19d9.

Conflicts:
	EasyHadoopCentral/application/controllers/operate.php