fade testing
Merge branch 'master' of https://github.com/qazeh/pdtv
Better country flash
Merge branch 'master' of https://github.com/qazeh/pdtv

Conflicts:
	config/settings.properties
	webapp/V3/index2.html
	webapp/V3/js/Map.js
colors