Moved world elements counting in each screen change

Signed-off-by: Raphael Catolino <raphael.catolino@gmail.com>
Merge branch 'master' of github.com:DeepInTheLight/DeepInTheLight