Phoenix#291
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/main/antlr3/PhoenixSQL.g
Merge pull request #298 from anoopsjohn/master

Issue#291 (Support PERCENTILE_CONT aggregate function)