Solving conflict in routes namespace
Merge pull request #826 from delving/13.02-cms-routing-fix

Solving conflict in routes namespace