added user settings page
Merge branch 'settings'

Conflicts:
	createTables.sql