fix for the next button issue plus explanation
Merge branch 'video_play_problem' of https://github.com/adamdruppe/beyondz-platform into adamdruppe-video_play_problem

Conflicts:
	app/views/shared/_asset_javascript_includes.html.erb
Merge branch 'adamdruppe-video_play_problem' into staging
Merge branch 'staging' of https://github.com/beyond-z/beyondz-platform into staging