changes and db change
Social Integratiion
ready for presentation
merge conflicts solved