BIG refactoring of the main route
Merge branch 'master' of http://github.com/ezpaarse-project/ezpaarse