Sync up

Sync up
Merge remote-tracking branch 'origin/master'

Conflicts:
	.classpath
	.project
	.settings/org.eclipse.jdt.core.prefs
	src/main/java/ca/jeb/gpb/datamodel/Address.java