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
Merge branch 'master' into blocks-resource
Merge pull request #3 from CruGlobal/blocks-resource

Blocks resource