Merge
Add a compass and a goal (earth)
Merge commit '0fd509bcc2d97515e04213d5ce02e5d970add36c' into development