transfer data
Merge branch 'master' of https://github.com/LittleFire1989/DreamDiary.git
Merge branch 'master' of https://github.com/LittleFire1989/DreamDiary.git
get info
Merge branch 'master' of
https://github.com/LittleFire1989/DreamDiary.git

Conflicts:
	res/layout/activity_new_dream.xml