Merge branch 'master' of https://github.com/jgat2012/ADT
Dispense Template
Merge branch 'master' of https://github.com/jgat2012/ADT

Conflicts:
	application/views/template.php
Merge branch 'master' of https://github.com/KevinMarete55443/ADT
Order Communication
Resizable Graphs
Made Get Buttons same size
Order Sysnchronization
Merge branch 'master' of https://github.com/RufusMbugua/ADT

Conflicts:
	assets/cache/13745006540b7dbc59281f60eb653fe7bdd22f3e2d.js
	assets/cache/13745035380b7dbc59281f60eb653fe7bdd22f3e2d.js
	assets/cache/13745856810b7dbc59281f60eb653fe7bdd22f3e2d.js
Database
Merged JS
Order Reorganization
Order Restructuring
ADT Orders
ADT Orders
ADT Changes
Problems
Dispensement Management
ADT Admin
Admin Privileges