fixed bower stuff
merge