Merge branch 'WJC' into temp-wxr

wxr

2021-03-23 09bde2ffef953fa5e78a4320aa8bbe03276ed7c5

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>