Merge branch 'release/2.1.2' into dev
[TASK] Fixed invalid "main" entry in bower.json
[TASK] Bump version
Merge branch 'release/2.1.3'