added portal id to resource and content type to filetypes
Merge branch 'master' of https://github.com/pbekker/justforteachers.co.za