Testing changes for Cucumber - Groups
Merge branch 'veda' of github.com:stevemcquaid/cmunity into veda

Conflicts:
	Gemfile
	Gemfile.lock