Merge branch 'release-1.0'
Merge branch 'release-1.1.0'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
bumped version number
Merge branch 'master' into develop
bower.json line sorting