Stop merging if command returns non zero response
Update our tests.sh script
Fixing tests
Change merge script to look a little more friendly
Make further changes to merge.sh to make it look better
Fix a typo
Merge branch 'master' into develop