update zshrc for dircolor
Merge remote-tracking branch 'origin/master' into ubuntu
update alias `gpsod` and `gmgod`

from development to develop
Merge branch 'ubuntu' into ubuntu-soliarize-light