Changes
Merge github.com:dany547/android_device_beni

Conflicts:
	BoardConfig.mk
	BoardConfig.mk~