Fixed conflicts
test
Merge branch 'master' of https://github.com/Happyness/social

Conflicts:
	Social/pom.xml
Fixed problems