bower fix
Merge branch '0.10.0-develop'