Calendar : Add lollipop ux

Change-Id: Ibc7bc2267b464c4f8c3d07c2406ed2cf87e7febb
Merge branch 'remote' into mkl

Conflicts:
	AndroidManifest.xml
	res/values/styles.xml

Change-Id: I23b46ddfd06ee2278418458a34a65f5a782c02c5