bower ajusts
Merge branch 'master' into HEAD

merge branchs