Merge branch 'WJC'

wxr

2020-12-09 b5f348ec1381a8b05d00e585a3e156381f751d72

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>