extended models
Merge branch 'YOLO'

Conflicts:
	app/controllers/clients_controller.rb
	app/models/client.rb
	app/views/clients/_form.html.slim
	app/views/clients/index.html.slim
	app/views/clients/index.json.jbuilder
	app/views/clients/show.html.slim
	app/views/clients/show.json.jbuilder