add test involving $urlMatcherFactoryProvider in stateSpec
Merge branch 'master' of https://github.com/mikekidder/ui-router

Conflicts:
	test/stateSpec.js