test commit after repository transfer
Merge remote-tracking branch 'origin/spatial_pooler_dev'

Conflicts:
	src/org/numenta/nupic/research/SpatialPooler.java