Updated version in pom to 1.1
Merge branch '1.1' of github.com:forcedotcom/phoenix into 1.1