sdf
nav titles
Merge remote-tracking branch 'origin/master'
new pagenav
new nav
up
Merge remote-tracking branch 'origin/master'

Conflicts:
	server.js
	sqlite/mopsidb1