added transaction-repository
Merge branch 'master' into transactions

Conflicts:
	website/src/main/webapp/addArtwork.jsp
Merge branch 'transactions'