Merge branch 'hotfix/tutorial_main_page' into develop
Merge branch 'hotfix/customconfig' into develop
Merge branch 'master' of github.com:cloud66/help into develop
haproxy customconfig