fix
Merge branch 'master' of https://github.com/cranefly/crane

Conflicts:
	nbproject/private/private.xml
de