Updating Polymer app
resolve merge conflicts