commit initial code of history page
fixing conflicts
Add user history
BHL-87
new BHL-87
Merge pull request #3 from YoustinaAtef/master

BHL_87