test 2
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/example/fmi_fmf/ContactListActivity.java
	app/src/main/java/com/example/fmi_fmf/FMFCommunicationService.java
	app/src/main/res/values/strings.xml