morning session will start 15 minutes earlier
Merge pull request #61 from confpub/master

Awards marked, latest location colors
Merge pull request #62 from Felienne/earlierstarttime

#icsm2013 morning session will start 15 minutes earlier
add locationindex for icsm
change update.sh echo
update
Merge branch 'master' of github.com:rtholmes/conf-data

Conflicts:
	update.sh
fix keynote colour
manually incorporate ICSM changes (to commit  dcf4e27, pull request #67)
WCRE 2013 initial setup