Merge pull request #1 from BbMobile/kitchen

Kitchen basics
updating to 3.6.0
Merge pull request #2 from BbMobile/update-to-3.6.0

+1
Merge branch 'master' into kitchen