Merge pull request #3 from ChinosInternationalCC/master

update
Merge pull request #4 from ChinosInternationalCC/master

update
Merge pull request #5 from ChinosInternationalCC/master

update
Merge pull request #6 from ChinosInternationalCC/master

update
Merge pull request #46 from chopsuey5000/master

simple update from l'estruch to try to compile last version
Merge pull request #7 from ChinosInternationalCC/master

update
add mapping steps in readme
Merge pull request #48 from kubamarkiewicz/master

readme
changed the location of Input and Output Event Manager
Merge branch 'master' of https://github.com/ChinosInternationalCC/chinoPinball into ChinosInternationalCC-master

Conflicts:
	chinoPinball.xcodeproj/project.pbxproj

merge chino rep
fixed Xcode project
integrated ofxSyphon
Merge pull request #49 from ovicin/master

integrated ofxSyphone, updates in the XCode project, compiled with XCode 5.0.2
path of the add ons should be relative to project
Merge pull request #50 from ovicin/master

path of the add ons should be relative to project
Merge pull request #8 from ChinosInternationalCC/master

update
Update README.md
Update clone_addons.sh
reset the ball with ENTER
Merge pull request #52 from kubamarkiewicz/master

reset the ball with ENTER