Merge master -> develop
Added Aliases, preparation to use route name
Added static routes for user friendly url