parser von patty und ida eingebunden
?
Merge branch 'master' of https://github.com/Idabkf/miapp

Conflicts:
	.DS_Store
	testmi/.DS_Store
	testmi/testmi/en.lproj/MainStoryboard.storyboard