When has focus, placeholders go away
Whitespace cleanup
Merge branch '1.x'

Conflicts:
	medium.js
version change
copyright year change
Merge branch '1.x'
Merge pull request #90 from morgante/master

Merge pull request #9 from jakiestfu/master
Merge pull request #10 from jakiestfu/master

Upstream