Beta version
Merge branch 'master' of https://github.com/elParaguayo/RPI-Info-Screen

Conflicts:
	plugins/clock/screen.pyc

Beta version