Facebook integration completed
conlicts removed
new message module integrated
conlicts removed
conlicts removed