Modified mapping so the controllers are mapped automatically using annotations.
Merge origin/leon into leon