Merge origin/master

Conflicts:
	IslandEcommerce/build/web/WEB-INF/classes/managedbean/DisplayPageBean.class
	IslandEcommerce/build/web/WEB-INF/classes/managedbean/ItemDetailsBean.class
	IslandEcommerce/build/web/WEB-INF/classes/managedbean/NoItemBean.class
	IslandEcommerce/build/web/WEB-INF/classes/managedbean/SelectRegionBean.class
Merge origin/master