Add i9100g and code cleanup
Merge branches 'jellybean2' and 'jellybean3' into jellybean3