test
Merge branch 'test-001' of https://github.com/jonny3132/pringsoft.git
into test-001

Conflicts:
	PringSoftCalendar/res/values/strings.xml