Updates
Merge branch 'master' of https://github.com/pulsarhealthcare/spotlight_ipad

Conflicts:
	presentations/01_presentation_what_is_spotlight/07_slide_reimbursement_england_and_wales/css/style.css
	presentations/01_presentation_what_is_spotlight/07_slide_reimbursement_england_and_wales/index.php
fixed scrolling
Merge branch 'master' of https://github.com/pulsarhealthcare/spotlight_ipad

Conflicts:
	global/js/global.js