progress
Merge branch 'master' of https://github.com/moshenglei/beautifuljournal

Conflicts:

	beautyjournals/beautyjournal/src/com/maple/beautyjournal/MainActivity.java