Revert "Spelling" (dependent on 1.1 branch)

This reverts commit 94c1baea165c9b159fa5f2fb3ad815f574c7b621.
Merge branch 'release/1-moorfields'
Merge branch 'release/1-moorfields'
Merge branch 'release/1.2-moorfields'

Conflicts:
	controllers/DefaultController.php
Merge branch 'master' into release/1.2-moorfields
Bringing master up to date