fix conflicts
Merge branch 'master' of https://github.com/damdirt/jFarm
UI Features + nbTiles and lvl + display popup details bulding
Fix conflicts