Imported source from Sogeti
Merge branch 'master' of https://github.com/meridium/golf-moregolf