Fix makefile includes
Merge branch 'master' of github.com:ljodal/DolphinDemo