Merge pull request #2 from farina-game/master

Merge pull request #24 from reger-men/master
Merge pull request #25 from FalseCAM/master

Terrain
model
Merge pull request #26 from reger-men/master

Model merge
Merge pull request #3 from farina-game/master

Merge