saving to csv now works with android 7, several changes to handling of user data (still in progress)
Merge branch 'master' of https://github.com/NdrsPtrw/SocialDoc

Conflicts:
	.idea/workspace.xml
	out/production/SocialDoc/SocialDoc.apk
	out/production/SocialDoc/SocialDoc.unaligned.apk
	out/production/SocialDoc/de/ovgu/swe_projekt/socialdoc/MainActivity.class
	src/de/ovgu/swe_projekt/socialdoc/MainActivity.java