Merge branch 'upstream-master' into parameters-finalized

Conflicts:
	src/main/java/org/numenta/nupic/Parameters.java
	src/test/java/org/numenta/nupic/integration/AbstractTemporalMemoryTest.java
	src/test/java/org/numenta/nupic/integration/BasicTemporalMemoryTest.java
	src/test/java/org/numenta/nupic/integration/ExtensiveTemporalMemoryTest.java
	src/test/java/org/numenta/nupic/unit/encoders/CategoryEncoderTest.java
	src/test/java/org/numenta/nupic/unit/encoders/ScalarEncoderTest.java
	src/test/java/org/numenta/nupic/unit/research/SpatialPoolerTest.java