Merge branch 'master' of https://github.com/RufusMbugua/ADT
Fix design in patient details
New Notifications
Upgraded JQuery
Merge branch 'master' of https://github.com/jgat2012/ADT

Conflicts:
	application/views/stock_transaction_v.php
Design profile
Merge branch 'master' of https://github.com/RufusMbugua/ADT

Conflicts:
	CSS/style.css
Merge branch 'master' of https://github.com/KevinMarete55443/ADT

Conflicts:
	Scripts/Merged_JS.js
	application/controllers/user_management.php
	application/views/template.php
New Settings Menu
Merge branch 'master' of https://github.com/RufusMbugua/ADT

Conflicts:
	application/views/template.php
Merge branch 'master' of https://github.com/RufusMbugua/ADT

Conflicts:
	application/views/template.php