Added merge hook, renamed hook script.
Merge branch 'merge-hook' into develop