spring JPA
Merge branch 'master' of
https://github.com/localengineer11/localengineer-new.git

Conflicts:
	src/com/localengineer/server/dao/AbstractDao.java
	war/WEB-INF/classes/com/localengineer/server/dao/AbstractDao.class