Added boat puzzle element
Merge branch 'beta' of https://github.com/byCedric/brx into beta

Conflicts:
	game/src/_lib/jsonp/level-city.json