Used PeopleCtrl & PeopleService in more examples so it's less confusing.
Merge remote-tracking branch 'origin/master'

Conflicts:
	angularjs-slides/index.html