EX-108 (jebene): adjusted naming convention
ex-96/108 (jebene): fixed merge.py tmp dir issues and consensus.py tag
naming issue
Merge remote-tracking branch 'origin/develop' into
EX-108_adjust_tag_naming_conventions

Conflicts:
	jacquard/jacquard.py
	test/jacquard_test.py
ex-126 (jebene/kmeng): fixed functional tests (consensus and merge)