update dreams
update dream_record
Merge branch 'master' of
https://github.com/LittleFire1989/DreamDiary.git

Conflicts:
	gen/org/mengker/dreamdiary/R.java
	res/layout/activity_main.xml
	res/menu/main.xml
add dream_view
Merge remote-tracking branch 'origin/master'

Conflicts:
	gen/org/mengker/dreamdiary/R.java
record update