New style
Merge branch 'dev' of github.com:openplacedatabase/www into dev