Commission Agents Gem
Merge branch 'commission_agents' into 2-2-stable

Conflicts:
	Gemfile
	Gemfile.lock