odkomentovani v developmentu
Merge branch 'war' into development