Move EntityManager injection to BlockService (and friends)
(so that jax-rs resources don't need to know the dependencies to the service classes)
Merge pull request #4 from CruGlobal/add-injection-to-jpa-layer

Move EntityManager injection to BlockService (and friends)
Finishing up rewriting services to return web entities for pages.  Tests pass, but code needs add'l review and cleanup
Merge branch 'master' of github.com:CruGlobal/conf-registration-api into conference-web-model

Conflicts:
	src/main/java/org/cru/crs/api/ConferenceResource.java
	src/main/java/org/cru/crs/api/PageResource.java