Setup bower for polymer
fixed conflict
Updatd bower.json, .gitignore and grunt lint rules according to comments