Merge branch 'master' into theme/aelesbao
Improve right prompt development environment info
Merge branch 'theme/aelesbao' into custom

Conflicts:
	modules/prompt/functions/prompt_aelesbao_setup