Merge branch 'testing'

Conflicts:
	lib/vx/citool/actions/ruby.rb