Merge pull request #1 from WardBrems/develop

Develop
Merge pull request #2 from WardBrems/master

master merge
Merge branch 'hotfix/21_februari_2014_2'
Merge pull request #3 from WardBrems/master

composer.json
Merge branch 'develop'
changed pallo.json -> ride.json
updated API documentation