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

Conflicts:
	IndexVersion.json