Merge branch 'dev' of https://github.com/iPlantCollaborativeOpenSource/Infosquito into dev

Conflicts:
	src/infosquito/es_crawler.clj
	src/infosquito/icat.clj
	src/infosquito/progress.clj
	src/infosquito/props.clj
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	src/infosquito/es_crawler.clj