Added Junit tests for Settings.java, renamed passwords.xml -> pwdsettings.xml
minor changes
Merge branch 'development' into read_settings