changes
initial
Merge branch 'master' of https://github.com/KevinMarete/ADT

Conflicts:
	.htaccess
	application/config/database.php
	application/controllers/drug_stock_balance_sync.php
	application/controllers/facilitydashboard_management.php
	application/controllers/order.php
	application/controllers/patient_management.php
	application/models/drug_stock_movement.php
	application/views/add_patient_v.php
	application/views/backup_v.php
	application/views/dispense_v.php
	application/views/edit_patients_v.php
	application/views/patient_listing_v.php
	application/views/sections/link.php
	application/views/settings_v.php
	application/views/template.php
	assets/cdrr_aggregate.xls
	assets/cdrr_stand_alone.xls
	assets/styles/style_report.css
	assets/templates/D-CDRR for Central Sites and District Stores.xls
	changelog.txt
changes
changes
Start ART issue
changes
changes
Transit patients, export, display all feature
changes
Merge branch 'master' of https://github.com/jgat2012/ADT

Conflicts:
	.htaccess
	application/views/sections/link.php
	changelog.txt
changes
Merge branch 'master' of https://github.com/KevinMarete/ADT
changes