adding polymer failed
Merge branch 'feature/polymer' of https://github.com/shawnsandy/sg-kit into develop

Conflicts:
	bower.json