Upgrade ES5-shim component, to include dist files with the licence header
Merge branch 'master' of github.com:onehippo/hippo-theme

Conflicts:
	bower.json