Merge branch 'joust'
Merge branch 'master' of https://github.com/Solid-Interactive/grasshopper-admin into kirby
Updating Bower.json