'data' property inheritance/override in chain of states

Collect all changes into one commit (previous pull request is closed - see https://github.com/angular-ui/ui-router/pull/248)