Merge pull request #4 from dbeyer/master

Integration of ETAPS 2013
working on icse
Merge branch 'master' of https://github.com/rtholmes/conf-data

Conflicts:
	IndexVersion.json
Merge remote-tracking branch 'upstream/master'