moved column to the right bleeping place
fixed conflict
Merge pull request #206 from Useful-Innovation/johans-fixes

blä
fixed send invoice again
Merge pull request #207 from Useful-Innovation/johans-fixes

fixed send invoice again
Merge remote-tracking branch 'origin/master' into davids-fixes