4 spaces to tab
Merge pull request #13 from cogmission/SpatialPooler_Ongoing_Dev

Spatial pooler ongoing dev
Merge branch 'master' of github.com:numenta/copic-j into SpatialPooler_Ongoing_Dev
Ok... tabs to 4 spaces ALL THE THINGS.
Merge pull request #15 from rhyolight/spaces-to-tabs

Spaces to tabs
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/main/java/org/numenta/nupic/data/ArrayUtils.java
	src/main/java/org/numenta/nupic/research/Parameters.java
	src/main/java/org/numenta/nupic/research/SpatialLattice.java
	src/main/java/org/numenta/nupic/research/SpatialPooler.java
	src/main/java/org/numenta/nupic/research/TemporalMemory.java
	src/test/java/org/numenta/nupic/unit/SpatialPoolerTest.java