Parser XML to Objects finished. Spotting Activity view started, bean, entity, Vo, service and DAO modified.
Parser XML to Objects finished. Spotting Activity view started, bean, entity, Vo, service and DAO modified.
Merge
Merge branch 'master' of https://github.com/UnalSoft/elite-fle

Conflicts:
	src/main/java/com/unalsoft/elitefle/dao/ActivityDAO.java