Merge remote-tracking branch 'origin/development' into mic_branch
submitting upgrading account to be continue
upgrade account
paypal testing
Merge remote-tracking branch 'origin/development' into mic_branch

Conflicts:
	application/models/admin_model.php
	application/views/account_setting_view.php
	application/views/admin/dentist_view.php
	js/custom.js
fix alter table
inventory item ongoing (procedure view fix)