manually doing what the generator will do now
Merge branch 'master' of https://github.com/curationexperts/bf_deploy