Added support for aliases for controllers and actions
Merge branch 'Alias'