Merge branch '1.5' of github.com:sulu/sulu-docs into 1.6

Merge branch '1.5' of github.com:sulu/sulu-docs into 1.6 #632