fixed hash bang and test for sh
fixed hash bang and test
Merge branch '1.4' of github.com:triAGENS/ArangoDB into 1.4
Merge remote-tracking branch 'origin/1.4' into devel

Conflicts:
	Makefile.in