update of WCRE
ASE: keynotes added, room assignment, affiliations fixed
WCRE: correction - remove double entries
FSE13 update (for consistency only)
renaming of the planary sessions
fixed a key problem
ASE: Workshops added
Merge pull request #72 from confpub/master

Updates for ASE and WCRE
Merge pull request #73 from hbaragar/master

SPLASH 2013 updates
Revert "manually incorporate ICSM changes (to commit  dcf4e27, pull request #67)"

This reverts commit ce731c33f6000e8f3a0098f655c45ab9adfaf8d9.
update index
Merge branch 'master' of https://github.com/rtholmes/conf-data
index
update splash icons
update ase icons
Merge branch 'master' of github.com:rtholmes/conf-data
Update for ASE: icons, schedule, new slots, new preprint URLs
Merge pull request #74 from confpub/master

Update for ASE: icons, schedule, new slots, new preprint URLs
SPLASH 2013 updates