added bower
merged in master