workspace update
Merge remote-tracking branch 'origin/polymer-core-drawer-implementation' into polymer-core-drawer-implementation

Conflicts:
	.idea/workspace.xml