Update devshelf.conf
Update and rename devshelf.conf to devshelf.sh
Update devshelf.sh
commit message
Reverting auto-commit
Merge remote-tracking branch 'origin/master' into l18n

Conflicts:
	article_data/css.json