Revert "merge commit with blade change"

This reverts commit fd0cdfd9dfdbaa388c7008201073f9c1dcfcee1b, reversing
changes made to d4e7fb9cd73a8aa88c5050b6702f29dc7f0576b9.
include angular, change routes
merged