typos

Conflicts:
	src/GUI/TriggerPointEdit.cpp
Update deploy_osx.sh

Fix for cases where the gecode libs are not in /usr/local/lib
Potential fix for issue #44. More testing required.
Fix crash at startup
increase gripzone size for the creation of relation
increase gripzone size for the creation of relation, add missing const
Merge branch 'dev' into feature/condition_edition