Updating database build files to include more data for a mock conference/pages/block
-Also adding a required field to the blocks table
Adding field to block Entity to fetch the required field and returning it in the API block class too
Merge branch 'master' into with-authentication

Conflicts:
	src/main/db/files/cru_crs_conferences.sql
	src/main/java/org/cru/crs/model/BlockEntity.java