Network sadness
Merge branch 'master' of https://github.com/theopak/glassface

Conflicts:
	GlassFace/src/com/theopak/glassface/MainActivity.java
I fed a lot of open cvs about faces x an y
Merge branch 'master' of https://github.com/theopak/glassface