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.
added .idea folder to gitignore
[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 'tolga/devel' into devel
Merge remote-tracking branch 'upstream/devel' into devel

Conflicts:
	.gitignore
chore(deps): update dependencies

- angular 1.3.1
- jasmine2 (required test updates)
fix(auth): make activity.auth=false work again

SD-1025
Merge remote-tracking branch 'upstream/devel' into devel
fix(spike): create a content filter builder

in order to add some global filtering there is a new component
for generating content filters that adds such filter.

SD-1007