add inactivity management
Merge branch 'master' of https://github.com/kasty/tvhackday

Conflicts:
	dancer/index.html
polish a bit