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

Conflicts:
	medium.js