Added support for DESTDIR in Makefile
Merge remote-tracking branch 'origin/develop'

Conflicts:
	Makefile