Move Serializers class to correct package.
Merge branch 'master' into two-dot-o

Conflicts:
	.gitignore
Merge branch 'two-dot-o' into entity-manager

Conflicts:
	stack/core/src/main/java/org/apache/usergrid/persistence/cassandra/QueryProcessor.java