Changed the output of the Now block
- current (now) events start with "until <endtime>"
- upcoming events start with starttime
- changed the colors of the starttime, endtime and location fields
Merge branch 'during-conference'

Conflicts:
	css/screen.css
	php/ajax.php
Merge branch 'during-conference'
Attempted hotfix for Live Q&A refresh
Fixed scrolling on Live Q&A
Merge branch 'master' of github.com:CANHEIT/CANHEIT-2013