Merge pull request #733 from hegek87/havoc

Resolve file data and quota in ui-routing