fix make's dependencies
Merge branch 'develop' into feature/pararellmake

Conflicts:
	Makefile
Merge branch 'feature/pararellmake' into develop