CM update upto 05/05/2013

Do not merge this PR until the Settings are updated. OR this will break the compiling

I will work on settings in morning.