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

Conflicts:
	beautyjournals/beautyjournal/res/layout/activity_home_2.xml
Merge branch 'master' of https://github.com/moshenglei/beautifuljournal

Conflicts:
	beautyjournals/beautyjournal/res/layout/activity_home_2.xml