#845
#change pass
#schema
Merge branch 'master' into grafik-replacement
#fix report for supervisor