introducing Porter
Merge branch 'master' of github.com:paddya/scf

Conflicts:
	nbproject/project.properties