Merge branch 'jb-mr2' of https://github.com/AOKP/device_samsung_tuna into jb-mr2

Conflicts:
	BoardConfig.mk
	device.mk
	init.tuna.rc
	power/power_tuna.c

Change-Id: Id70da26381c5bcb96b0408fd437ff82ebc9386e2