Merge branch 'flockui' of https://github.com/bennlich/agentscript into bennlich-flockui
Fixed a variable naming bug in DataSet.importImageDataSet().
Merge branch 'image-dataset'

Conflicts:
	lib/data.map
	lib/data.min.js