delete haoyan
Merge branch 'master' of https://github.com/LittleFire1989/DreamDiary.git
welcome flipper edit haoyan
commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/AndroidManifest.xml
	gen/org/mengker/dreamdiary/R.java
	res/layout/activity_test.xml
	res/layout/activity_welcome.xml
	res/values/strings.xml