Populate river + bucket data in Account Map

 Return the list of rivers and buckets an account owns, is
collaborating on or follows when querying account data.
AccountController Tests

* Fixed missing authentication.
* Dates now RFC822 formatted.
* Added followers/following to account model.
Set connection timezone to UTC in test data script.
Added dozer for easy bean to bean mapping
Added getByName method for Accounts

* Also added an Account DTO for easier mapping.
Implemented getRiverById

* and associated data, models and transfer objects.
* moved the channel_filters and channel_filter_options tables to
river_channels and river_channel_options respectively.
pom.xml: Change artifact-id to swiftriver-api
Integration tests for AccountDao
Fix failing bucket controller test
Merge remote-tracking branch 'origin/dashboard-content-dev' into buckets-api-dev
roller.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/JpaRiverDao.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/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/service/AccountServiceTest.java
	src/test/java/com/ushahidi/swiftriver/core/api/service/RiverServiceTest.java
	src/test/java/com/ushahidi/swiftriver/test/AbstractTransactionalTest.java
	src/test/resources/config/sql/test-data.sql

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/JpaRiverDao.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/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/service/AccountServiceTest.java
	src/test/java/com/ushahidi/swiftriver/core/api/service/RiverServiceTest.java
	src/test/java/com/ushahidi/swiftriver/test/AbstractTransactionalTest.java
	src/test/resources/config/sql/test-data.sql