Moved projects to POM
Moved projects to POM
Modified effiiciencies for selects to work
Modified merged with Irinas tests
Modified merged with Irinas tests
Merge branch 'master' of https://github.com/Auronspan/Survive.git

Conflicts:
	Survive-POM/Survive-Java-API/src/main/java/com/muni/fi/pa165/dto/MonsterWeaponDto.java
	Survive-POM/Survive-Java-API/target/maven-archiver/pom.properties
	Survive-POM/Survive-Java-Core/target/classes/MonsterWeaponMapper.xml
	Survive-POM/Survive-Java-Core/target/maven-archiver/pom.properties
	Survive-POM/Survive-Java-Core/target/surefire-reports/TEST-com.muni.fi.pa165.dao.gen.GenericDaoAbsTest.xml
	Survive-POM/Survive-Java-Core/target/surefire-reports/TEST-com.muni.fi.pa165.dao.jpa.impl.AreaDaoImplTest.xml
	Survive-POM/Survive-Java-Core/target/surefire-reports/TEST-com.muni.fi.pa165.dao.jpa.impl.MonsterDaoImplTest.xml
	Survive-POM/Survive-Java-Core/target/surefire-reports/TEST-com.muni.fi.pa165.dao.jpa.impl.SystemUserDaoImplTest.xml
	Survive-POM/Survive-Java-Core/target/surefire-reports/TEST-com.muni.fi.pa165.dao.jpa.impl.WeaponDaoImplTest.xml
	Survive-POM/Survive-Java-Core/target/surefire-reports/TEST-com.muni.fi.pa165.dao.service.impl.AreaServiceImplTest.xml
	Survive-POM/Survive-Java-Core/target/surefire-reports/TEST-com.muni.fi.pa165.dao.service.impl.MonsterAreaServiceImplTest.xml
	Survive-POM/Survive-Java-Core/target/surefire-reports/TEST-com.muni.fi.pa165.dao.service.impl.MonsterServiceImplTest.xml
	Survive-POM/Survive-Java-Core/target/surefire-reports/TEST-com.muni.fi.pa165.dao.service.impl.MonsterWeaponServiceImplTest.xml
	Survive-POM/Survive-Java-Core/target/surefire-reports/TEST-com.muni.fi.pa165.dao.service.impl.SystemUserServiceImplTest.xml
	Survive-POM/Survive-Java-Core/target/surefire-reports/TEST-com.muni.fi.pa165.dao.service.impl.WeaponServiceImplTest.xml
	Survive-POM/Survive-Java-Core/target/surefire-reports/TEST-com.muni.fi.pa165.entities.AreaTest.xml
	Survive-POM/Survive-Java-Core/target/surefire-reports/TEST-com.muni.fi.pa165.entities.WeaponTest.xml
	Survive-POM/Survive-Java-Core/target/surefire-reports/com.muni.fi.pa165.dao.gen.GenericDaoAbsTest.txt
	Survive-POM/Survive-Java-Core/target/surefire-reports/com.muni.fi.pa165.dao.jpa.impl.AreaDaoImplTest.txt
	Survive-POM/Survive-Java-Core/target/surefire-reports/com.muni.fi.pa165.dao.jpa.impl.MonsterDaoImplTest.txt
	Survive-POM/Survive-Java-Core/target/surefire-reports/com.muni.fi.pa165.dao.jpa.impl.SystemUserDaoImplTest.txt
	Survive-POM/Survive-Java-Core/target/surefire-reports/com.muni.fi.pa165.dao.jpa.impl.WeaponDaoImplTest.txt
	Survive-POM/Survive-Java-Core/target/surefire-reports/com.muni.fi.pa165.dao.service.impl.AreaServiceImplTest.txt
	Survive-POM/Survive-Java-Core/target/surefire-reports/com.muni.fi.pa165.dao.service.impl.MonsterAreaServiceImplTest.txt
	Survive-POM/Survive-Java-Core/target/surefire-reports/com.muni.fi.pa165.dao.service.impl.MonsterServiceImplTest.txt
	Survive-POM/Survive-Java-Core/target/surefire-reports/com.muni.fi.pa165.dao.service.impl.MonsterWeaponServiceImplTest.txt
	Survive-POM/Survive-Java-Core/target/surefire-reports/com.muni.fi.pa165.dao.service.impl.SystemUserServiceImplTest.txt
	Survive-POM/Survive-Java-Core/target/surefire-reports/com.muni.fi.pa165.dao.service.impl.WeaponServiceImplTest.txt
	Survive-POM/Survive-Java-Core/target/surefire-reports/com.muni.fi.pa165.entities.AreaTest.txt
	Survive-POM/Survive-Java-Core/target/surefire-reports/com.muni.fi.pa165.entities.WeaponTest.txt
	Survive-POM/Survive-Web/target/Survive-Wen-1.0-SNAPSHOT/WEB-INF/classes/StripesResources_en.properties
	Survive-POM/Survive-Web/target/classes/StripesResources_en.properties
	Survive-POM/Survive-Web/target/maven-archiver/pom.properties
	Survive-POM/Survive-Web/target/war-exec.properties