Moved catch and final then block to outermost promise
Merge branch 'calendar' into non-sequential-list

Conflicts:
	js/student-list.js