added initial categories, made action nullable
Merge branch 'master' into south_sudan