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

Merge branch '1.4' of github.com:sulu/sulu-docs into 1.5 #825