Improving locations management
Create and view portal ad
Merge branch 'master' of https://github.com/DerekSansom/shine

Conflicts:
	sp-admin-web/src/test/java/com/sp/LocationsEntityTest.java
	sp-dao/src/main/java/com/sp/entity/loc/Area1.java
	sp-dao/src/main/java/com/sp/entity/loc/Area3.java
	sp-dao/src/main/java/com/sp/entity/loc/Country.java
	sp-dao/src/main/java/com/sp/entity/loc/Location.java
	sp-services/src/main/java/com/sp/locations/BoardLocationsMapper.java
	sp-services/src/main/java/com/sp/locations/NoLocationResultsException.java
	sp-services/src/main/java/com/sp/locations/UrlUtils.java
	sp-services/src/test/java/com/sp/locations/BoardLocationsMapperTest.java
	sp-services/src/test/java/com/sp/locations/GoogleResultStrings.java
	sp-services/src/test/java/com/sp/locations/UrlUtilsTest.java