Move platform.js up.
Update polymer.
Merge remote-tracking branch 'origin/master'