Introduce Makefile for development purpose
Merge remote-tracking branch 'origin/master' into 122-external-node-classifier

Conflicts:
	.travis.yml