HUGE commit
Merge branch 'master' of github.com:yrezgui/dropbox-polymer-demo

Conflicts:
	.gitignore
	README.md