Final completion of ScalarEncoder, ScalarEncoderTest, Encoder base class
Merge branch 'master' into encoderwork
Fix some copyrights, formatting
Merge pull request #76 from cogmission/encoderwork

Encoderwork - Phase 1 (Base encoder class and ScalarEncoder)
Make encoder library stateful
Merge pull request #78 from cogmission/statefulencoder

Make encoder library stateful
regenerate docs for new api changes
Merge pull request #80 from cogmission/statefulencoder

regenerate docs for new api changes
new docs
Merge pull request #81 from cogmission/categoryencoderwork

new docs
created CategoryEncoder and added CategoryEncoderTest
generate doc files for new classes
Merge pull request #83 from cogmission/categoryencoderwork

created CategoryEncoder and added CategoryEncoderTest
Merge remote-tracking branch 'upstream/master'

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