Merge pull request #5 from Nickname53/develop

Develop
Merge pull request #6 from Nickname53/develop

Develop
Merge pull request #10 from Nickname53/develop

Develop
Something strange with solr index O_O
-
Rezolved merge conflicts
Changed properties
Merge branch 'develop' of github.com:Nickname53/DMS_Internship into develop