Phoenix#276, Phoenix#8
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