Importer 2 attached disks
Redirect legacy routes to new ones
Merge branch 'aaron' of github.com:Aloja/aloja