added .idea folder to gitignore
Merge remote-tracking branch 'upstream/devel' into devel
Merge remote-tracking branch 'upstream/devel' into devel
Merge remote-tracking branch 'upstream/devel' into devel

Conflicts:
	.gitignore
Merge remote-tracking branch 'upstream/devel' into devel
Merge remote-tracking branch 'upstream/devel' into devel
Merge remote-tracking branch 'upstream/devel' into devel
Merge remote-tracking branch 'upstream/devel' into devel
Merge remote-tracking branch 'upstream/devel' into devel
Merge remote-tracking branch 'upstream/devel' into devel
Merge remote-tracking branch 'upstream/devel' into devel
[SD-1022] Fixed the problem where the user was not able to edit the fields related to the "config" object of the ingest prodivder.
Merge remote-tracking branch 'upstream/devel' into devel

Conflicts:
	.gitignore
Merge remote-tracking branch 'upstream/devel' into devel
[SD-1003] Role cannot inherit itself as its ancestor
[SD-944] Add source field to the ingest provider.
Merge pull request #521 from petrjasek/devel

fix(spike): create a content filter builder
Merge pull request #523 from mdhaman/devel

[SD-944] Adding source to the ingest provider.
fix(authoring): fixed minor bug where closing items act strangely.

SD-1046
Merge pull request #524 from eozan/workqueue-close-fix

fix(authoring): fixed minor bug where closing items act strangely.