Updated master branch to allow for merge of awesome-colorful-toolbar branch