Added merge of scenes
Health fix
Boat can now reset
Merge branch 'beta' of https://github.com/byCedric/brx into beta