Merge pull request #96 from hason/bower

Updated bower branch