Fix errors when using localStorage in Safari's private browsing mode (#1489996)

Conflicts:

	program/js/app.js