Integrated user history story
Merge branch 'masterMaster' into masterMasterm

Signed-off-by: john <john@johnVB>