Got it running
Merge branch 'master' of git://github.com/elai/HSFacesAndroid into elai-master

Conflicts:
	.idea/.name
	.idea/gradle.xml
	.idea/misc.xml
	.idea/modules.xml
	HackerSchool/HackerSchool.iml
Merge branch 'elai-master'. Thanks @elai