test
Merge branch 'master' of https://github.com/Chengwen/Dictionary-Android

Conflicts:
	res/layout/fragment_main.xml
Merge branch 'master' of https://github.com/Chengwen/Dictionary-Android

Conflicts:
	res/layout/fragment_main.xml