Long polling
Merge branch 'master' of https://github.com/arirahikkala/tulkoonvalo

Conflicts:
	app2/slider.js