Pull request - Update and Add path config

This will bring the AndroidUI branch to current with master and add the configuration options to the file browser for selecting a default path.