...
Merge branch 'senderos-gc' of github.com:glob3mobile/g3m into senderos-gc