Merge branch 'release/v2.0' into develop
Upgrade bower packages
Bump up version numbers
Merge branch 'release/v2.1'