Merge branch 'master' into invoicing

Conflicts:
	spec/models/characters/agent_spec.rb