All Tests green
Merge branch 'master' into spec-cleanup

Conflicts:
	lib/cybercoach.rb
	lib/cybercoach/abstract_resource.rb
	lib/cybercoach/user.rb
	spec/lib/cyber_coach_spec.rb