Add server field and secret field to settings.
Add header to settings page.
Remove scrollbar from the header in settings.
Merge branch 'moresettings'

Conflicts:
	www/js/secondPage.js
	www/secondPage.html