Merge branch 'master' of https://github.com/craftercms/social into 2.3.x

Conflicts:
	admin/pom.xml
	blog/pom.xml
	pom.xml
	server/pom.xml
	ui/pom.xml
	virus-scanner/pom.xml
Merge branch 'master' of https://github.com/craftercms/social into 2.3.x

Conflicts:
	admin/pom.xml
	blog/pom.xml
	pom.xml
	server/pom.xml
	ui/pom.xml
	virus-scanner/pom.xml
Merge branch '2.3.x' of https://github.com/craftercms/social into 2.3.x

Conflicts:
	admin/pom.xml
	blog/pom.xml
	pom.xml
	server/pom.xml
	ui/pom.xml
	virus-scanner/pom.xml
Merge pull request #113 from ffgarciam/2.3.x

2.3.x