Model relationships
Merge branch 'master' of https://github.com/RaikesCohort2013/code-one

Conflicts:
	app/models/Transaction.php