removed default directory
Merge remote branch 'remote/master'

Conflicts:
	dbsettings.xml
Login reinstated