Conflicts:
	bootstrap.php
	include/ajax.orgs.php
	include/class.dept.php
	include/class.file.php
	include/class.organization.php
	include/class.staff.php
	include/staff/profile.inc.php