fix update.sh
Merge branch 'installation_simple' of https://github.com/arturoc/FaceSubstitution into installation_simple
Merge branch 'installation_simple' of https://github.com/arturoc/FaceSubstitution into installation_simple
Merge branch 'installation_simple' of git://github.com/arturoc/FaceSubstitution into installation_simple
Merge branch 'installation_simple' of git://github.com/arturoc/FaceSubstitution into installation_simple
Merge branch 'installation_simple' of git://github.com/arturoc/FaceSubstitution into installation_simple
update.sh: don't try to run the app, just kill it
Merge branch 'installation_simple' of github.com:arturoc/FaceSubstitution into installation_simple

Conflicts:
	FaceSubstitution/update.sh
Merge branch 'installation_simple' of github.com:arturoc/FaceSubstitution into installation_simple
Merge branch 'installation_simple' of github.com:arturoc/FaceSubstitution into installation_simple
Merge branch 'installation_simple' of github.com:arturoc/FaceSubstitution into installation_simple

Conflicts:
	FaceSubstitution/update.sh