fix gitsubmodule and rebar deps
Merge branch 'master' into develop