Merge branch 'hotfix/2.2.11'
Bumped bower.json version number
Merge branch 'hotfix/2.2.12' into develop