Merge branch 'master' of https://github.com/ronaldsmartin/APO-DZ-Android

Conflicts:
	APO-DZ/res/values/strings.xml
first/preferred name in Directory Details works
test implementation to sort directoryList (not tested)
Merge https://github.com/ronaldsmartin/APO-DZ-Android

need to merge new changes
committing new changes