improve directory & file deletion & creation on bundle script
Merge remote branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	tools/bundle.sh