Upgraded versions to fix Astayanx bug until https://github.com/Netflix/astyanax/pull/484 is released
Updated column ordering so that max versions are first in our column order since they are the most likely to be read and returned.
Updated column ordering so that max versions are first in our column order since they are the most likely to be read and returned.
Merge branch 'two-dot-o' of github.com:usergrid/usergrid into two-dot-o

Conflicts:
	stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/WriteUniqueVerify.java