Add CM Account

Change-Id: Idfb2d2bfa97406c187d513c75a36c1cdb1b929a6
Merge remote-tracking branch 'cm/cm-10.1' into cm-10.1

Conflicts:
	default.xml