online-demo moved
Merge branch 'master' into moving-online-demo
improved Makefile