for test
Merge branch 'master' of https://github.com/moshenglei/beautifuljournal
fix conflicts of xml
for update
indexPage tabBottom