merge PR #54
Merge branch 'master' of github.com:locomotivecms/documentation