nanananna
Merge branch 'master' of https://github.com/qazeh/pdtv

Conflicts:
	config/settings.properties
Merge branch 'master' of https://github.com/qazeh/pdtv