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

Conflicts:
	presentations/00_presentation_opening_map/00_slide_opening_map/index.php
Merge branch 'master' of https://github.com/pulsarhealthcare/spotlight_ipad