Added shortcuts to server.
Merge branch 'server' of https://github.com/csadorf/automation into server