Merge branch 'release/1.0'
Merge branch 'release/1.1'
Update README.md
Update README.md
patched the classnames
Merge branch 'hotfix/1.1.1' into develop
Merge branch 'master' of github.com:jaggyspaghetti/cakefactory into develop