Version 4
Merge remote-tracking branch 'origin/master'

Conflicts:
	KMKYProject/KMKY/src/main/AndroidManifest.xml
	KMKYProject/KMKY/src/main/java/uts/kmky/MyRelationships_Activity.java
Version 5