Initial commit with small changes
Merge remote-tracking branch 'origin' into devel

Conflicts:
	libs/ConfigManager.py
	rootthebox.cfg