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
add gradle
mark conflict
remove gradle
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
position
position
merge trunk
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
enrich menu
Merge pull request #28 from ticmy/master

enrich menu
enrich sliding 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