commit to satisfy eclipse imac
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/contactmanager/ContactManagerImpl.java