Make complete configuraton of jetty and tomcat 7 plugins in Eclipse,
they works fine. Also deployment on Wildfly 8 works fine. Have problems
with jerseyTest.
Merge branch 'master' of https://github.com/VlasovArtem/MyCity2.git

Conflicts:
	MyCity2/mycity-services/pom.xml
	MyCity2/mycity-services/src/main/webapp/WEB-INF/web.xml
	MyCity2/mycity-services/src/test/java/org/hillel/it/resource/AssessmentResourceTest.java