Added user blamaing feature
Merge branch 'backup'