CHANGE Removed block_id from property as it wasn't being used
Merge branch 'master' of github.com:BCS-io/letting

Conflicts:
	todo/letting.TODO