Merge project with local

Move load helper from bacecontroller to autoload