Rework routing
Rework routing
Merge branch 'architecture' of https://github.com/owncloud/tasks into architecture

Conflicts:
	controller/collectionscontroller.php
[tx-robot] updated from transifex
Merge pull request #66 from owncloud/architecture

Rework routing