'test'
Merge branch 'master' of https://github.com/sendon1982/tripadviator.git

Conflicts:
	tripadviator-service/src/main/java/com/tripadviator/serivce/base/AbstractBean.java
	tripadviator-service/src/main/java/com/tripadviator/serivce/product/ProductImportService.java
	tripadviator-service/src/main/java/com/tripadviator/serivce/product/response/ProductResponse.java
	tripadviator-service/src/main/java/com/tripadviator/serivce/rest/RestClient.java