wip
Merge branch 'master' of github.com:fblandroidhackathon/weardrone into swav/fix-parse-from-wear
Merge pull request #3 from fblandroidhackathon/swav/fix-parse-from-wear

Swav/fix parse from wear