Squashed:

FIX: Fix for #218

REFACTOR: proc instead of if statement as suggested by @Daxter

FIX: syntax error
Merge branch '218-CLEAN-override-i18n-translations-for-specific-resources' of github.com:goodylabs/active_admin into 218-CLEAN-override-i18n-translations-for-specific-resources

Conflicts:
	lib/active_admin/base_controller/translation.rb