started adapting createOrUpdateInternship on custom.js
Merge origin/master

Conflicts:
	js/custom.js
finished createOrUpdateDay