SPLASH 2013 updates
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