Revert "Revert "database files""

This reverts commit e2ffc3336222a71f26e8c63e03e996853f40697c.

Conflicts:
	CalendarWrapper.java