Merge pull request #70 from confpub/master

Updates for WCRE 2013; ASE 2013 added
update content type docs
SPLASH 2013 updates
Merge pull request #71 from hbaragar/master

SPLASH 2013 updates
add splash placeholder
update of WCRE
ASE: keynotes added, room assignment, affiliations fixed
WCRE: correction - remove double entries