Merge commit 'rivers-api-dev' into merge-dev

Conflicts:
	src/main/java/com/ushahidi/swiftriver/core/api/controller/RiversController.java
	src/main/java/com/ushahidi/swiftriver/core/api/dao/AccountDao.java
	src/main/java/com/ushahidi/swiftriver/core/api/dao/RiverDao.java
	src/main/java/com/ushahidi/swiftriver/core/api/dao/impl/JpaDropDao.java
	src/main/java/com/ushahidi/swiftriver/core/api/dao/impl/JpaRiverDao.java
	src/main/java/com/ushahidi/swiftriver/core/api/dto/PlaceDTO.java
	src/main/java/com/ushahidi/swiftriver/core/api/dto/TagDTO.java
	src/main/java/com/ushahidi/swiftriver/core/api/exception/BadRequestException.java
	src/main/java/com/ushahidi/swiftriver/core/api/service/BucketService.java
	src/main/java/com/ushahidi/swiftriver/core/api/service/RiverService.java
	src/main/java/com/ushahidi/swiftriver/core/model/Account.java
	src/main/java/com/ushahidi/swiftriver/core/model/Bucket.java
	src/main/java/com/ushahidi/swiftriver/core/model/Channel.java
	src/main/java/com/ushahidi/swiftriver/core/model/ChannelOption.java
	src/main/java/com/ushahidi/swiftriver/core/model/Drop.java
	src/main/java/com/ushahidi/swiftriver/core/model/Place.java
	src/main/java/com/ushahidi/swiftriver/core/model/River.java
	src/main/resources/config/dozer-bean-mappings.xml
	src/main/resources/config/sql/schema-create.sql
	src/main/webapp/WEB-INF/spring/web-context.xml
	src/test/java/com/ushahidi/swiftriver/core/api/controller/AbstractControllerTest.java
	src/test/java/com/ushahidi/swiftriver/core/api/controller/AccountsControllerTest.java
	src/test/java/com/ushahidi/swiftriver/core/api/controller/RiversControllerTest.java
	src/test/java/com/ushahidi/swiftriver/core/api/dao/impl/JpaAccountDaoTest.java
	src/test/java/com/ushahidi/swiftriver/core/api/dao/impl/JpaRiverDaoTest.java
	src/test/java/com/ushahidi/swiftriver/core/api/service/AccountServiceTest.java
	src/test/java/com/ushahidi/swiftriver/core/api/service/RiverServiceTest.java
	src/test/java/com/ushahidi/swiftriver/core/utils/SwiftRiverUtilsTest.java
	src/test/java/com/ushahidi/swiftriver/test/AbstractTransactionalTest.java
	src/test/resources/config/sql/test-data.sql