Merge branch 'master' into 1.5

Conflicts:
	.travis.yml
	Plugin/Extensions/View/ExtensionsPlugins/admin_index.ctp
	Plugin/Extensions/View/ExtensionsThemes/admin_index.ctp