Merge branch 'develop'
#2 Enhanced documentation, added example post-merge hook for git
Merge branch 'hotfix/2' into develop