Update version 0.5.1
bower/npm update
Merge branch 'master' into dev
Update version to 0.6.0
bower/npm update