Deleted jointest to get rid of class exception
Merge remote-tracking branch 'origin/master'

Conflicts:
	log