Changing from inheritance of the contractor to membership
Merge remote-tracking branch 'origin/master'

Conflicts:
	include/contract_light_traits.hpp