Implementing feature #14, improved application routing
Merge branch 'feature-14' into develop