Merge branch 'v2.3.0'
Update bower.json
Merge v2.3.0
Update bower.json
merge master