minor changes
Merge branch 'master' into andreas
services changes
optimizing map loader indicators
lots of improvements
removing invoice items