added DAO
added DAO
Merge branch 'master' of https://github.com/nazarenkoff/campus

Conflicts:
	campus/campus-persistence-jar/src/main/java/com/campus/model/User.java
	campus/campus-web/target/campus-web-1.0-SNAPSHOT.war
	campus/campus-web/target/maven-archiver/pom.properties
	campus/campus-web/target/surefire-reports/TEST-com.campus.rest.JaxRsActivatorTest.xml
	campus/campus-web/target/surefire-reports/com.campus.rest.JaxRsActivatorTest.txt