Sprint 1 release completed

Merging feature/world into master branch