Importation is much faster and has a better code organization 
Conflicts:
	models/functions/importGeneralFile.php
Importation is much faster and has a better code organization 
Conflicts:
	models/functions/importGeneralFile.php
Merge origin/master

Conflicts:
	views/js/custom/assign_advisor_script.php