Pull in from origin.
Fixed conflicts.
Add funds and withdraw funds now only allows verified bank accounts. Also does not break if no bank account are verified.
Fixed add funds, withdraw funds.
merge
clean
Merge commit '829f4050912267409837189b198304e3dd77b65e'