Merge branch 'WJC' into NewFilePath

wxr

2021-01-14 d987694e57c3bce76bd5a208d74a3696db222a4a

1
2
3
4
5
6
<?xml version="1.0" encoding="utf-8"?>
<resources>
    <color name="colorPrimary">#2c3e50</color>
    <color name="colorPrimaryDark">#1B3147</color>
    <color name="colorAccent">#3498db</color>
</resources>