Some changes
Merge branch 'new' of https://github.com/sils1297/codec into new

Conflicts:
	codeclib/fillib/settings/Setting.py