re-added code that needs PHP 5.2 / 5.3
Merge branch 'stable'
OKAPI settings update
okapi project update r567
switched okapi settings from lib/ to config2/settings.inc.php
fixed okapi revision
changed child wp name format to a better readable variant
Merge branch 'stable'
translate 'adm1' country names
Merge branch 'stable'
Merge branch 'master' into next