configuration overhaul -- unstable!
Merge remote-tracking branch 'origin/master'

Conflicts:
	config/kiosk.ini
	pyrikura/kiosk.py
unstable!