merge with http://sourceforge.net/p/me722-cm/code/

Change-Id: Ib33828b3bc906a0901be10601ce668640d520161