Merge branch 'release/1.0.0' into dev
update bower version
Merge branch 'dev'