Attempted spydroid integration
Merge
Merge branch 'master' of github.com:ashovlin/collaboracam-android