Merge branch 'master' into bianca/details

Conflicts (manually resolved by @shakeelmohamed):

src/main/java/com/expedia/seattleu/dataaccess/repositories/EanPropertySe
rvice.java
	src/main/java/com/expedia/seattleu/domain/services/PropertyService.java

src/test/java/com/expedia/seattleu/dataaccess/repositories/EanPropertySe
rviceTest.java
Ran IntelliJ's optimize imports