Fix placeholder in older browsers.
Renamed template db/settings to pages.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	index.html