Merge branch 'develop'

Conflicts:
	dist/scnprojectsetup-0.0.1.tar.gz
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'master' into develop

Conflicts:
	dist/scnprojectsetup-0.0.1.tar.gz
	scnprojectsetup.rb