Merge branch 'hotfix/v2.1.1'
Merge branch 'release/v3.0.0'
Update README
Upgrade AngularJS to v1.2.21
Change version number
Merge branch 'hotfix/v3.0.1' into develop