数据库微调
Merge remote-tracking branch 'origin/master'

Conflicts:
	ReadMeNote/src/com/example/readmenote/MyNoteActivity.java