Merge branch 'release/1.0' into develop
better bower.json
better timing
Merge branch 'develop'