Merge remote-tracking branch 'origin/master' into integrations

Conflicts:
	.gitignore
	framework/pom.xml
Merge remote-tracking branch 'origin/integrations' into integrations

Conflicts:
	.gitignore
	framework/pom.xml
Merge branch 'integrations' of https://github.com/Appverse/appverse-web into integrations
added twitter and facebook support