Implemented dummy data for historyand Added organisationunit to user, and fixed schema inconsistencies
Merged with ismail's changes