Merge branch 'jb-mr2_mkt' of https://github.com/MoKee/android_device_samsung_i9100g into jb-mr2_mkt_aidfarhan

Conflicts:
	BoardConfig.mk