Ignore this commit
Merge branch 'master' of github.com:cl05tomp/eve-industry-tracker

Conflicts:
	eve-industry-tracker/app/controllers/Transactions.java
Merge branch 'master' of github.com:cl05tomp/eve-industry-tracker
Merge branch 'master' of github.com:cl05tomp/eve-industry-tracker
Got a complete model for the wallet journal.

I ran into trouble testing. I am having issues with composite key