Video youtube Fix #5
Merge branch 'master' of https://github.com/LEI/opendata

Conflicts:
	application/assets/javascripts/application.js