update global stuff
add Makefile
Merge branch 'master' into lamp3