Updated upto 04/17/2013

Everything builds fine. I dont have a device to test so someone please test before merging both PRs

Will be adding the remaining commits later