Fixed test break and JSON MIME type. Fixes issue #2978.
Removed whitespace.
Merge branch 'master' of https://github.com/lubosdz/yii2

Conflicts:
	tests/unit/framework/helpers/FileHelperTest.php