fixing importer
Merge branch 'master' of https://github.com/nmbook/csc296s14-dbsys-tams

Conflicts:
	utils.php