Better names
Merge branch 'master' into gh-pages
2014-12-10 update
Merge branch 'gh-pages' of github.com:ryanfb/pleiades-static into gh-pages

Conflicts:
	places/236549.html
	places/432827.html