add datebase
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/miracle/dictionary/MainActivity.java