Tweaks and cleaning up
Merge branch 'master' of https://github.com/ginkage/EJLookup-Android

Conflicts:
	AndroidManifest.xml
	res/values-en/strings.xml
	src/com/ginkage/ejlookup/Settings.java
Typo.