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

Change-Id: I16ef33a7bccc69d0bc339c34601b7763a1f5ac99