Add the support to the TinyInt(i.e. byte) and (Unsigned)SmallInt(i.e.  short).
Phoenix#276, Phoenix#8
Merge remote-tracking branch 'upstream/master'
Commit the changes into the master
Merge remote-tracking branch 'upstream/master'
Phoenix#8
Merge pull request #277 from anoopsjohn/master

Support Distinct Count
Secondary Index I
Merge pull request #284 from tonyhuang/index

Secondary Index I
Fix compiler errors from secondary index pull
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/main/java/com/salesforce/phoenix/schema/PDataType.java
Merge pull request #273 from JingchengDu/master

Add the support to the TinyInt and (Unsigned)SmallInt
Change the sqlType of the UNSIGNED_SMALLINT from 12 to 13 since the sqlType of the VARCHAR is 12.
Merge remote-tracking branch 'upstream/master'
Merge pull request #295 from JingchengDu/master

Modify the sqlType of the UNSIGNED_SMALLINT
re-calulate byte-size for MappedByteBufferSortedQueue
Phoenix#291
re-calculate byte size for OrderedResultIterator
Merge pull request #297 from maryannxue/master

Resolve issue #294
Reverting secondary indexing support to fix the build.

Original code is still available at SHA 1a11cb5f0280a2e404a79a0a8877f906ef526c22.