adding angular-ui-route
Merge branch 'master' into ui-router

Conflicts:
	.gitignore