rails4 compability
Merge branch 'master' of https://github.com/aderyabin/active_admin-awesome_nested_set into aderyabin-master

Conflicts:
	active_admin-awesome_nested_set.gemspec