add searchActivity
Merge branch 'master' of https://github.com/m1688/Hirebird

Conflicts:
	res/values/styles.xml
Merge branch 'master' of https://github.com/m1688/Hirebird

Conflicts:
	res/values/styles.xml
Merge branch 'master' of https://github.com/m1688/Hirebird
Merge branch 'master' of https://github.com/m1688/Hirebird
Merge branch 'master' of https://github.com/m1688/Hirebird
add searchActivity
merge conflict
Merge branch 'master' of https://github.com/m1688/Hirebird

Conflicts:
	AndroidManifest.xml
	res/values/ids.xml
	res/values/strings.xml
	res/values/styles.xml
Merge pull request #28 from ticmy/master

enrich menu
Merge pull request #29 from ticmy/master

enrich sliding menu
Merge branch 'master' of https://github.com/m1688/Hirebird

Conflicts:
	res/values/ids.xml
Merge pull request #30 from chunterg/master

增加搜索界面
fix conflict
Merge pull request #31 from chunterg/master

fix conflict