Merge remote-tracking branch 'aokp/jb-mr1' into aokp-jb-mr1

Conflicts:
	default.xml