Commit that I don't really want to do
Merge branch 'mergeBranch'

Conflicts:
	Contacts2/.classpath