Forward port Templates functionality

Patchset1 : Fixed tabs

Change-Id: Ieb9e54249dd512e65f23f32d503d11fba88335ee

Conflicts:

	res/values/strings.xml