Adds hide-variable-amount attribute to Merchant resource
Add charge_customer_at field
Merge pull request #20 from gocardless/charge-customer-at-field

Add charge_customer_at field
Updated POM and CHANGELOG in preparation for 2.x release
[maven-release-plugin] prepare release gocardless-java-2.0.0
[maven-release-plugin] prepare for next development iteration
Fixes typo-d return type
Merge pull request #12 from gocardless/add-hide-variable-amount

Adds hide_variable_amount attribute to Merchant resource
Merge branch 'master' into payouts

Conflicts:
	src/main/java/gocardless/api/Bill.java
	src/test/java/gocardless/api/ApiTest.java
	src/test/java/gocardless/api/Fixtures.java