retro scanning all folders, working...
Merge branch 'master' of https://github.com/zakrn/piraten-server

Conflicts:
	private/js/tvmanager.js