Merge branch 'develop' into issue_5

Conflicts:
	app/models/cyte.rb
	db/schema.rb
	spec/factories/cytes.rb
	spec/models/cyte_spec.rb