changing charset and uploading brands
Merge branch 'master' of https://github.com/ziejka/controlling-system