fix #616
Merge remote-tracking branch 'origin/master' into 1.4.6

Conflicts:
	zp-core/class-image.php
Diasble plugins if not MOD_REWRITE