Updated upload transaction
updated things
Merged with master
Just one bug left
Fixed transaction import from csv
Merged upload_transactions into master