2.6 (Mikkel)
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	KMKY/src/com/kmky/activity/MyRelationships.java
2.6 (Mikkel)
2.7 (Mikkel)