Android fix or not
Merge branch 'master' of https://github.com/blan4/MbLock

Conflicts:
	android/mbLock/src/com/mbLock/App/KeyGenerator.java