Merge remote-tracking branch 'origin/eyoung' into mdeslis
Merge remote-tracking branch 'origin/eyoung' into mdeslis
Merge remote-tracking branch 'origin/master' into mdeslis
working on main menu settings as well as refactoring xml
strings.xml updated
current notes fragment, string xml and notes dialogue
Merge branch 'mdeslis'