normalizing framework and userlog data to use same fields
Merge branch 'master' into print2