Merge origin/master

Conflicts:
	application/l10n/EnL10N.php
	application/l10n/L10N.php
	application/models/Residential.php
	application/modules/ResidentialItem.php