Added the ability to make general charges on a customer or card.
Merge branch '2.0'