FEND-866 added logic to accommodate new facebook data format
Merge branch 'fend866'