more #000 --> #4D4D4D color changes
Merge remote-tracking branch 'origin/master'
Merge branch 'master' into deploy_client