fix view routing from controller
Merge branch 'develop'
fix view routing from controller