Changed some props
Merge branch 'origin/develop'

Conflicts:
	src/phonebook/AddEntryDialog.java
Sixth commit