fix notifications, touch events and calendar
Merge remote-tracking branch 'origin/version_2' into version_2

Conflicts:
	templates/login.html