Fix shell setting for Makefile
Merge develop with local-deploy