video distribution
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/Slender/API/Controller/VideodistributionsController.php