upgrade to 1.5 and add back changes.
Merge branch 'upgrade-to-v1.5'
Merge branch 'master' of https://github.com/clas-web/batch-create-uncc

Conflicts:
	batch-create.php