Changed routing
Merge branch 'master' into ReFactorFrontEnd
Partial job on refactoring controllers and html code
Finished refactoring to new partition of pages and controllers
Merge remote-tracking branch 'origin/ReFactorFrontEnd'
Merge master to staging for version team city build 1.0.157