Merge pull request #6 from ChinosInternationalCC/master

250314
Merge pull request #7 from ChinosInternationalCC/master

update 08042014
Merge pull request #8 from ChinosInternationalCC/master

update 08042014_2
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 #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
indicate editor mode
Merge pull request #128 from ovicin/master

indicate editor mode
Replacement of x,y,z scaling for a general Value.
Resolving merging issues
Merge branch 'master' of https://github.com/ChinosInternationalCC/chinoPinball
started to implement the removing of an object from scenario

pending to implement void Scenario::popObject(SimpleObject* obj)
Merge pull request #129 from ovicin/master

started to implement the removing of an object from scenario
Editor Object Gui set at right position
Press Label to prepare Object for remove and delete with mouse pressing it.
Remove Obect by clicking with mouse
Merge pull request #34 from ChinosInternationalCC/master

last updates from chino repo