nu med adapter
Merge branch 'emilsbranch'

Conflicts:
	res/menu/reminders.xml