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
Merge branch '1.1' of github.com:tonyhuang/phoenix into essentialcf
Change some more methods about Phoenix metadata.