Merge branch 'master' of https://github.com/EuniceManyasi/ADT

Conflicts:
	application/controllers/auto_management.php
	application/views/patient_listing_v.php
	application/views/sections/link.php
pending issue 2
Merge branch 'master' of https://github.com/EuniceManyasi/ADT

Conflicts:
	application/controllers/auto_management.php
	application/views/patient_listing_v.php
	application/views/sections/link.php
22nd may pending issues
Merge branch 'master' of https://github.com/EuniceManyasi/ADT

Conflicts:
	application/controllers/dispensement_management.php
	application/controllers/patient_management.php
	application/views/dispense_v.php
	application/views/sections/link.php
Merge branch 'master' of https://github.com/EuniceManyasi/ADT
changes
Merge branch 'master' of https://github.com/EuniceManyasi/ADT

Conflicts:
	application/views/patient_listing_v.php
	application/views/sections/link.php
Password length
changes
Merge branch 'master' of https://github.com/jgat2012/ADT

Conflicts:
	application/config/database.php
	application/views/sections/link.php
changes 26th may
updated version
changes 26th 5pm
changes
changes
Merge branch 'master' of https://github.com/wambuimungai/ADT

Conflicts:
	application/controllers/dispensement_management.php
	application/controllers/patient_management.php
	application/views/change_password_v.php
	application/views/dispense_v.php
	application/views/patient_details_v.php
	application/views/sections/link.php
changes
stock transactions
Merge branch 'master' of https://github.com/KevinMarete55443/ADT

Conflicts:
	application/controllers/inventory_management.php
	application/views/change_password_v.php
	application/views/sections/link.php