history
history menu doalog
history adapter
fix conflict
Merge branch 'master' of https://github.com/liangxiaofei1100/ZhaoYanJuYou