Merge branch '1.2' of github.com:sulu/sulu-docs into 1.3

Merge branch '1.2' of github.com:sulu/sulu-docs into 1.3 #629