Merging
merge
Merge branch 'release/1.2.0'
fix bower rev