[#67] add stone class
[#67] add HasStone
[#67] add Stone
[#67] add stone and tree png
[#67] reoder code
[#67] disable popup around stone
[#67] complete tree logic
[#67] complete stone logic
fix conflict