1.0.1 for real forgot bower
Merge branch 'master' into develop