Updated specs
Merge branch 'master' into spec-cleanup

Conflicts:
	cybercoach.gemspec