Updated camelCase
Merge branch 'gaminator-devel' into jesko
Updated camelCase