silence deprecation warnings
Merge branch 'fp2-rails4' of github.com:gkuchta/awesome_nested_set into fp2-rails4

Conflicts:
	lib/awesome_nested_set/awesome_nested_set.rb