Renamed route functions
Implementing feature-12, renamed router functions
On feature-12, resolved git-flow  error (non-fast-forward)
Merge branch 'feature-12' into develop