Add task to build self contained app
Create property file for data directory
Merge origin/master

Conflicts:
	nbproject/project.properties