invoice controller
Merge branch 'master' into mikkel
merged master