修改数据库
Merge remote-tracking branch 'origin/master'
集成有道云方法
Merge remote-tracking branch 'origin/master'

Conflicts:
	ReadMeNote/AndroidManifest.xml
	ReadMeNote/bin/AndroidManifest.xml
	ReadMeNote/bin/classes/com/example/readmenote/MainActivity.class
	ReadMeNote/bin/classes/com/example/readmenote/R$drawable.class
	ReadMeNote/bin/classes/com/example/readmenote/R$id.class
	ReadMeNote/bin/classes/com/example/readmenote/R$layout.class
	ReadMeNote/bin/classes/com/example/readmenote/R$menu.class
	ReadMeNote/bin/classes/com/example/readmenote/R$string.class
	ReadMeNote/bin/classes/com/example/readmenote/R$style.class
	ReadMeNote/gen/com/example/readmenote/R.java