Ignore phpstorm config files
Merge svn changes for issues #11728 and #11729. refs #11728, refs #11729
Remove old config key conceptsBaseUri from the application.ini.dist. refs #11728, refs #11729
Add missing logoff icon.
Update logoff icon path.
Update scripts version. refs #11728
Fix right panel resizing. fixes #11906
Merge pull request #2 from picturae/11906

Fix right panel resizing. fixes #11906
Add confirmation if document property is not saved. fixes #11909
Add cache and sass-cache to git ignore. refs #11909
Get relations info on small chunks. refs #11910
Add loading if showing a concept or editing a concept takes too long. refs #11910
Fix disable relations buttons after a concept is saved. refs #11910
Fix saving of empty alt labels and doc properties. refs #11160
Fix datestamp missing issue and deleted status issue. refs #11434, refs #11682
Merge branch 'master' into 11728
solved conflict in public/assets/styles/editor.css
Merge pull request #3 from picturae/11909

Add confirmation if document property is not saved. Add cache and sass-cache to git ignore.
Merge pull request #4 from picturae/11910

Fix load and edit of concepts with large amount of relations.
Merge pull request #5 from picturae/11160

Fix saving of empty alt labels and doc properties. refs #11160
Fix scrolling for advanced search form. Remo css files debug info. refs #12118