s
Merge remote-tracking branch 'origin/test-001' into test-001

Conflicts:
	PringSoftCalendar/res/values/strings.xml