change timout
fix for the next button issue plus explanation
Changed status bar to simply single value (instead of stacked).
Merge pull request #72 from adamdruppe/devise_timeout

Devise timeout
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
Merge pull request #74 from bgrayless/simplify_progress_bar

Simplify progress bar