merging changes
permission changes
managing links connections
merging changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
making a team link