Some necessary changes
Merge branch 'master' of https://github.com/analogyc/wordiary

Conflicts:
	src/net/analogyc/wordiary/BaseActivity.java