Merge branch 'hotfix/2.4.1'
Added version back in to bower.json
Merge branch 'master' into develop