Merge branch 'jb-mr2_mkt' of github.com:MoKee/android into jb-mr2_mkt_aidfarh_twrp

Conflicts:
	default.xml

Change-Id: I0cec585179a1e50e2a05faafe0ce3ce593b725fb