Not sure
Merge branch 'master' of https://github.com/RingOfFireOrg/spitfire

Conflicts:
	nbproject/private/private.xml