UI updates
Merge branch 'master' of https://github.com/abhiyerra/keymaster

Conflicts:
	src/com/lookout/keymaster/fragments/KeyVerifyFragment.java