changes
prophylaxis
issues
changes
migration
migration
migration
migration
changes
changes
changes
settings changes
changes
changes
inventory
changes
changes
changes
Updates
Merge branch 'master' of https://github.com/KevinMarete/ADT

Conflicts:
	application/config/database.php
	application/views/migration_v.php
	application/views/sections/link.php