Services updated
Merge remote-tracking branch 'origin/master'
A bit of refactoring on the actions and panels ...