COPY
Merge branch 'master' into Kamil
fixed views
Merge branch 'master' into Kamil
fixed views