Merge branch 'release/v0.1'
Merge branch 'develop'
Merge branch 'release/v1.0.0'
Merge branch 'release/v1.0.0'
Fixed bower.json, removed comments
Merge branch 'hotfix/v1.0.1' into develop