me edit haoyan
welcomemain edit haoyan
haoyan
haoyan me&welcome
Merge remote-tracking branch 'origin/master'

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/classes/org/mengker/dreamdiary/R$drawable.class
	bin/classes/org/mengker/dreamdiary/R$id.class
	bin/classes/org/mengker/dreamdiary/R$layout.class
	bin/classes/org/mengker/dreamdiary/R$menu.class
	bin/classes/org/mengker/dreamdiary/R$string.class
	bin/classes/org/mengker/dreamdiary/R$style.class
	bin/classes/org/mengker/dreamdiary/RecordActivity.class
	bin/classes/org/mengker/dreamdiary/RegisterActivity.class
	bin/classes/org/mengker/share/ShareActivity$ShareAdapter.class
	bin/classes/org/mengker/share/ShareActivity.class
	gen/org/mengker/dreamdiary/R.java
	res/values/strings.xml
Merge branch 'master' of https://github.com/LittleFire1989/DreamDiary.git