Fixed Email.admin_email config static naming
Removed unused DataExtension::$extendable_statics

Oversight from cleanup in 876f4c5
BUGFIX: fixed access to asset_preview_width in getFieldsForImage
Merge pull request #1341 from g4b0/8347-getFieldsForImage

BUGFIX: fixed access to asset_preview_width in getFieldsForImage
API i18n::$common_languages and i18n::$common_locales converted to Config API

They are now accessed via the Config API, and contain associative rather than indexed arrays.
Before: `array('de_DE' => array('German', 'Deutsch'))`, after: `array('de_DE' => array('name' => 'German', 'native' => 'Deutsch'))`.

Also fixed a i18n.js_i18n config accessor
Fixed help_link config usage
Remove incorrectly added diff file
Fixed i18n.common_locales definitions
Solved json obj to array issue
Merge pull request #1344 from g4b0/8330-cache-issue-in-CMSVersion

Solved json obj to array issue
FIX: Set ModelAdmin tab targets to avoid creating new panels
Merge pull request #1345 from ajshort/pulls/modeladmin-tabs

FIX: Set ModelAdmin tab targets to avoid creating new panels
Simplified travis builds (external setup scripts)
More straightfoward travis include/exclude
Merge remote-tracking branch 'origin/3.1'

Conflicts:
	.travis.yml