freshen
Merge branch 'master' of github.com:Polymer/polymer

Conflicts:
	polymer.js
	polymer.js.map