Added the first step of the android fingerprint code
Merge branch 'master' of github.com:TeamFauna/dumbo

Conflicts:
	android/dumbo/.idea/misc.xml
	android/dumbo/.idea/workspace.xml