add gradle
mark conflict
remove gradle
position
position
merge trunk
Merge pull request #30 from chunterg/master

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

fix conflict
fix menu selected/unselected bug
Merge pull request #32 from ticmy/master

fix menu selected/unselected bug
add position detail
modify
update
modify
xx
edit
commit
Merge pull request #33 from xinwei76/master

职位详情-初稿-待优化
职位发布页面重构
Merge branch 'master' of https://github.com/m1688/Hirebird

Conflicts:
	AndroidManifest.xml
	res/values/styles.xml
	src/main/java/com/recruit/app/ui/job/PostJobCompanyFragment.java
	src/main/java/com/recruit/app/ui/job/PostJobJobFragment.java
	src/main/java/com/recruit/app/ui/job/PostPositionFragment.java