added user marker
Facebook WIP. Suspended for now.
Merge remote-tracking branch 'origin/dev.gab' into dev.tim.chandler
Merge remote-tracking branch 'origin/dev.dms' into dev.tim.chandler
Disabled facebook init.
Removed placeholders.
Merge remote-tracking branch 'origin/dev.tim.chandler' into dev.dms