Some more xml configs
Added unit tests for ResourceFactory
Merge branch 'master' of https://github.com/igorcoding/tp_2014_02_java_Latkin

Conflicts:
	server/data/pages.xml
	server/data/urls.xml