first commit
Merge branch 'master' of https://github.com/ZiphTech/Stranded

Conflicts:
	build/built-jar.properties
	dist/Stranded.jar
	nbproject/private/private.properties
	nbproject/project.properties