add two test unit and could not pass
pass test and fix the has one could not restore problem
Merge branch 'rails4' into setting_restore
use classs_name and foreign_key restore

when the model has_one use class_name or foreign_key, restore use
class_name or setting the foreign_key.
merge rails4 branch and fix conflict
Replace deprecated RSpec failure_message_for_should syntax
Rephrase matcher failure messages according to RSpec 3 style
Retain compatibility with RSpec 2 matchers
Merge pull request #156 from lime/rspec-deprecations

Fix RSpec 3.x deprecations
Clear association cache after restore with recursive
Always return self when restore
Merge pull request #157 from poporul/clear_association_cache

Clear association cache
Merge branch 'rails4' into setting_restore

Conflicts:
	test/paranoia_test.rb
Merge pull request #123 from JeskTop/setting_restore

hasOne association could not restore
Update README.md
Merge pull request #161 from dharamgollapudi/patch-1

Add compatibility info for rails4
Fix usage of paranoia_column in related models

refs https://github.com/radar/paranoia/issues/102
Merge pull request #164 from milabent/rails4

Fix usage of paranoia_column in related models
Merge upstream/rails4