breaking sub-calculations out of calculateTotal()
Merge branch 'master' of github.com:zuha/Transactions-Zuha-Cakephp-Plugin

Conflicts:
	Model/Transaction.php