merge dev1
merge dev1
Merge branch 'dev4' of https://github.com/Juba95/newart into dev4
merge dev1