injected personService into videosList controller
Made some changes
Merge conflict solved
Fixed personService.js error
Merge pull request #37 from Zacsi/user-model

User model
videoApp error
Merge pull request #38 from Zacsi/user-model

videoApp error
Fixed error on 'videoList' directive
Merge branch 'master' into eed

Conflicts:
	videos/app/videosApp.js
Merge pull request #39 from Zacsi/eed

Eed
injected personModule into app.js
Merge pull request #40 from Zacsi/user-model

injected personModule into app.js
Small Changes
Person into scope
Merge pull request #41 from Zacsi/user-model

Person into scope
Merge branch 'master' into upload-modal