Fixed: failing unit tests
Merge branch 'master' of https://github.com/rayo/rayo-server.git

Conflicts:
	rayo-core/src/main/java/com/rayo/core/xml/providers/RayoProvider.java