(BY: eda) Adding Users Model file user.php
(BY: veer) unmerged changes commited