Merge branch 'chruffer-project_adminapi'
fixed linebreak and added comment
Merge branch 'master' of github.com:fritzpay/paymentd

Conflicts:
	.gitignore
payment method status PK change
metadata refactoring
payment method model
Merge branch 'metadata_api' of github.com:chruffer/paymentd into payment_methods
add payment method metadata model
fixed database field names to m. instead of md.
Merge branch 'metadata_api' of github.com:chruffer/paymentd into payment_methods
continue with payment method
add insert payment method status
move test db decorators to testutil pkg
first sql tests
extend tests and fix bugs
metadata by primary tx
selecting metadata and test
fix JSON tags, do not include provider ID
Merge pull request #24 from wongak/payment_methods

Payment methods