Use correct SQL Connection given by Resource Space
Merge branch 'master' of github.com:CurrentSolutions/xlsimport

Conflicts:
	pages/controllers/history.php