Updated Controllers and Models

Master data update for the models controllers and the MainNav
Merge branch 'master' of https://github.com/ScriptXKE/AHIS