Router: Convert dashes to underscores only when doing automatic routes so that you can have dashes in your regexs for manual
Merge branch 'staging' of github.com:websiteduck/IgniteXT into staging