monitoring a folder now

getting ready to persist
automatic persistence works
Merge branch 'master' of https://github.com/jesiryan/DoesThisBreakThings

Conflicts:
	cd-html5-mobile/src/main/java/cia/group6/services/EntitiesEJB.java