camel case filenames
Merge branch 'master' of github.com:octris/core
camel case filenames