bower

merge pull recuest
#1168