updated to jdk 1.7 in compiler plugin
Merge branch 'master' of github.com:zznate/intravert-ug
Merge pull request #10 from boneill42/master

Pom / markdown / warnings cleanup
fix ed's crazy indenting
fix ed's crazy indenting
fix ed's crazy indenting
initial cut of token management stuff
Expermental client
added comment
updated to cassandra 1.2-beta
Ow yea!
Working better
upgrade to 1.2-beta2 changes, CassandraServer changes in such
Handles xml and json payloads moves code into service
Things missed in last commit
More changes
Merge branch 'master' of https://github.com/zznate/intravert-ug

Conflicts:
	src/main/java/org/usergrid/vx/client/HelloClient.java
Fixes
Merge pull request #11 from edwardcapriolo/master

XML+Json code moved to service layer
Hello intrastate