fixed placement of placeholder text.
Tests for JSON, properties, sources, renders
accidentally merged master
Merge branch 'gh-pages' into rails
bad merge with master