Changed the regex for the RController, the previous one gave some issues when passing along a url as a request parameter.
fixed merge conflict.