fixes #169
fixes #168
Merge branch 'master' of github.com:ErikGrimes/polymer_ui_elements

Conflicts:
	pubspec.yaml