Merge remote-tracking branch 'origin/develop'

Author: snipe

resources/lang/en-US/admin/settings/general.php

@@ -456,7 +456,7 @@
         'scoping' => 'Scoping',
         'formats' => 'Default Formats',
         'profiles' => 'User Profiles',
-        'eula' => 'EULA & Acceptance Preferences',
+        'eula' => 'EULA & Acceptance Preferences',
         'misc_display' => 'Miscellaneous Display Options',
         'email' => 'Email Preferences',
         'checkin' => 'Checkin Preferences',