automatic cbi commit
Merge branch 'master' of ghk:kuerzn/cbi

Conflicts:
	desktop-artwork/wallpapers
automatic cbi commit