removed nested url's for now.
some code cleanup
Merge branch 'feature/branching_impl' into develop