user model added
conflicts are fixed
Merge branch 'master' of https://github.com/ns-jeeb/eagle_ontario into pirdad