Revert "Update from master"

Reverts nikaspran/ui-router#1