* Include shared source files in build process
Merge branch 'hotfix/makefile' into develop