Fixing namespace issues
Merge branch '4.0' of git://github.com/thecodingmachine/mvc.splash-common into 4.0