video player
Merge branch 'master' of github.com:guidone/PrestoAddons

Conflicts:
	VideoPlayer/VideoPlayer.js