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

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

Eed