Merge remote-tracking branch 'origin/master' into emily

changed Makefile to support master and slave, but not yet merge include folder into one variable