using correct package-manager
Merge branch 'hotfix/1.1.1'
Merge tag '1.1.1' into develop

1.1.1

Conflicts:
	bower.json
	package.json