[BUGFIX] ADWD-1158 Fix sorting of aemters
Merge pull request #63 from subugoe/ADWD-946

[BUGFIX] ADWD-1158 Fix sorting of aemters
[BUGFIX] Fix localization of search field
[TASK] ADWD-1050 fix image captions
Merge pull request #60 from subugoe/ADWD-1050

[TASK] ADWD-1050 fix image captions
Merge pull request #66 from subugoe/develop

Merge develop into master branch