testing
updated transaction history page and logic
request check finish
stan

update
Merge branch 'master' of https://github.com/jes2ica/Task-Seven

Conflicts:
	CFS/src/orm/account.xml
	CFS/src/orm/transaction.xml
	CFS/src/struts.xml