Merge pull request #16 from AutoScout24/master

Fixed conditions
Merge pull request #17 from AutoScout24/ConditionsEditable

Merge pull request #16 from AutoScout24/master