new rebar
Merge branch 'feature/sessions' into develop