Merge branch 'master' of https://github.com/WardBrems/ride-web-search
Merge branch 'release/21_februari_2014'
RIDCOR-17 composer.json
Merge branch 'hotfix/21_februari_2014_2' into develop