integrate facebook feature partially done
quick fix
resolve conflict