Merge branch 'hotfix/0.21.40'
rename 'jQuery' to 'jquery' in bower.json
Merge branch 'hotfix/0.21.41' into develop

Conflicts:
	bower.json