fixed image admin page
Merge branch 'master' into stable
Merge branch 'master' into stable
corrected typo

Conflicts:
	.travis.yml
another typo?
i hate yaml
improve the travis setup process
install beta version of imagick on travis for php5.4 support
Merge branch 'stable'

Conflicts:
	.travis.yml

Adjust test script location