Merge branch 'cm11' into HEAD

Conflicts:
	extendedcommands.c
	nandroid.c
	ui.c

Change-Id: Ifa4bd9db153771b07fe588e0f1fe1deda92bec6f