Added query support
Merge branch 'master' of https://github.com/revolutionarysystems/objectology

Conflicts:
	src/main/java/uk/co/revsys/objectology/serialiser/xml/XMLOlogyTemplateDeserialiser.java