Rearranging a couple endpoints
-Moving the POST to add a page to the ConferenceResource
-Changing the path of PageResource from /conferences/{conferenceId}/pages to /pages for simplicity
Adding Block Resource endpoint file
Merge branch 'pages-resource' into blocks-resource
Changing the ID path parameter to type UUID from String since RestEasy can implicity convert it.  It saves code.
Adding stub methods for block resource
Merge branch 'master' into blocks-resource

Conflicts:
	src/main/java/org/cru/crs/api/ConferenceResource.java
	src/main/java/org/cru/crs/api/PageResource.java
	src/test/java/org/cru/crs/api/client/ConferenceResourceClient.java
	src/test/java/org/cru/crs/api/client/PageResourceClient.java
Fixing broken path in setup script when filename changed
Adding built out block resource and block service
-Adding ability to create a new block
-Updating location header for new page
Adding block resource test client
Change table field names.
Correct UUID formats.
inserting json formatted answer into answer table
Merge branch 'master' into blocks-resource
Merge pull request #3 from CruGlobal/blocks-resource

Blocks resource
Adding data transformation layer for conferences (and pages) to isolate JPA to one layer only and
allow for web friendly names in the API.
Adding data transformation code for Pages, finishing out Conferences and beginning Blocks
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