for update
Merge branch 'master' of https://github.com/moshenglei/beautifuljournal
Merge branch 'master' of https://github.com/moshenglei/beautifuljournal
Merge branch 'master' of https://github.com/moshenglei/beautifuljournal
Merge branch 'master' of https://github.com/moshenglei/beautifuljournal
Merge branch 'master' of https://github.com/moshenglei/beautifuljournal
for uptate
fix conflicts of MainActivity.java