Merge pull request #123 from ovicin/master

loading DAE with animation
Rescaling all object with one var. needs to fix object collisions. Seems that the object mesh is not updated like scale factor is.
Merge branch 'master' of https://github.com/ChinosInternationalCC/chinoPinball

Conflicts:
	src/GameObjects/Obstacle.cpp
Merge pull request #28 from ChinosInternationalCC/master

update
add models
Merge pull request #127 from kubamarkiewicz/master

models
Modify Scale by GUI. Adjusting values
Merge branch 'master' of https://github.com/ChinosInternationalCC/chinoPinball
Merge pull request #33 from ChinosInternationalCC/master

last updates from chino repo