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
fix(lock): make isLocked work same in list and authoring

so it can handle lock_user being user id or user dict with id in it.

SD-1002
[SD-1000] User preferences are not saved properly
feat(unlock): notify user that item was unlocked in authoring

SD-1002
Merge remote-tracking branch 'nikola/devel' into devel
SD-919 - The logged user is not able to change his password
fix(users): User info is updated correctly after saving.

SD-1018
Merge pull request #511 from petrjasek/devel

lock fix & unlock notification for authoring
fix(authoring) - save button is disabled when autosave exists
Merge remote-tracking branch 'ozan/user-edit-fix' into devel
Merge remote-tracking branch 'nelu/devel' into devel