Merge branch 'release-v1'
Merge branch 'release-v1.1'
Alert-error to alert-danger to update to bootstrap 3
Bump to version 1.1.1
Merge branch 'hotfix-v1.1.1' into dev