Merge branch 'master' of github.com:smokienko/android-hack

Conflicts:
	NFCq/src/com/chernicka/MainActivityChernicka.java