changing not valid attributes in admin panel
Merge branch 'dev'