social to inputs
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
social to inputs2