test
Merge branch 'master' of https://github.com/legopiraat/MD-RIA-Agenda

Conflicts:
	iOS/iOS.xcodeproj/project.pbxproj