Added code to show/hide Extra Info button based on
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/appMain.js
Video popup code tweaked to stop video on exit, set to time 0 upon show. Also positioning and displaying tweaked.