Updated version in pom to 1.1
Merge branch '1.1' of github.com:forcedotcom/phoenix into 1.1
Merge branch 'master' into 1.1
Update Phoenix grammer to support "DESC" in inline PRIMARY KEY definition.
For consistency, also allow "ASC" to be specified after "PRIMARY KEY".
Fix grammer for asc/desc parsing.
Add column sort order to SYSTEM.TABLE.
Return default value when sort order is not found in system.table.
Actually initialize sortOrder.
Refactor, get test to pass.
Merge remote branch 'upstream/master'

Conflicts:
	src/main/antlr3/PhoenixSQL.g
Handle bit inversion in WhereOptimizer.
Support asc/desc syntax in constraint clause.
Add back erroneously removed method.
Fix test failures - store columns listed in 'constraint' in order.
Move 'getColumnModifier' to PDatum.
Basic comparison on a desc col working.
LTrim and Substr.
Pass ColumnModifier down into codecs.
More SUM/AVG tests, add support for MIN/MAX.