Merge branch 'next' into parameterchanges
Merge branch 'parameterchanges' of https://github.com/andrepuschmann/iris_core into reconf
allow parameter in controllers