Merge branch '2.1' of github.com:sulu/sulu-docs into 2.2

Merge branch '2.1' of github.com:sulu/sulu-docs into 2.2 #730