Partial revert of 4186182c: removed workaround for charset issue fixed in ZF 2.3.2
PHPUnit 4.2 compatibility fix.
ZF 1.12.8 compatibility fix.

Conflicts:
	README.md
Migrated computer/group configuration form.