finish cast
tmp
fix to merge
into master
Merge branch 'train' into state-country

Conflicts:
	Gemfile
add: model Type
training: cache in different storage and Conditional Get
Merge branch 'cache' into develop

Conflicts:
	.gitignore
	app/controllers/clients_controller.rb
	app/models/client.rb
	app/views/clients/_client.html.haml
	config/environments/development.rb
update to rails 4.1, add threadsafe request, add server puma
rails 4.1 fiche
training: Asset Pipeline
remove: porn pic