Implemented DB UserDetailsService and ClientDetailsService

* Authenticates users and clients from details stored in the db.
Merge branch 'master' into rivers-dev

Conflicts:
	src/main/webapp/WEB-INF/spring/web-context.xml
Encrypt client secret
createAccount and modifyAccount implemented.
Create, Get, Delete client apps implemented.
modifyClient implemented.
Activate account in addition to user during activation.
Fix activation

* Set user not expired and locked.
* Grant user role
Token both activates account and changes password

* A token during modify account will both activate an inactive account
and if a modified password is present instead of either just
activating/reseting password and not both.
Reset Password: Throw error if token present but password missing

* Indicates to the user there is a problem.
Merge branch 'master' into rivers-dev

Conflicts:
	src/main/java/com/ushahidi/swiftriver/core/api/controller/AccountsController.java
	src/main/java/com/ushahidi/swiftriver/core/api/service/AccountService.java
	src/main/resources/config/sql/schema-create.sql
	src/main/resources/config/sql/schema-destroy.sql
	src/main/webapp/WEB-INF/spring/web-context.xml
	src/test/java/com/ushahidi/swiftriver/core/api/controller/AccountsControllerTest.java
	src/test/java/com/ushahidi/swiftriver/core/api/service/AccountServiceTest.java
	src/test/resources/config/sql/test-data.sql
Merge branch 'rivers-dev'

Conflicts:
	src/main/java/com/ushahidi/swiftriver/core/api/service/BucketService.java
	src/main/resources/config/sql/schema-create.sql
	src/main/webapp/WEB-INF/spring/web-context.xml
	src/test/resources/config/sql/test-data.sql