grunt and bower
merge fix