Update bower dependency to keep it happy
Update dependencies
Merge branch 'develop' into feature/issue-1003-update-diamondash-dependency
Merge branch 'feature/issue-1003-update-diamondash-dependency' into develop