more refactoring structure
Merge branch 'master' into nozzle

Conflicts:
	lib/dm-swift.rb
	lib/swift/carrierwave.rb
temporarily force :ru locale
Merge branch 'master' into nozzle