Merge branch 'master' of github.com:sgissinger/OwlNest into sgissinger-pull

Conflicts:
	Builds/VisualStudio2010/OwlNest.vcxproj
	Builds/VisualStudio2010/OwlNest.vcxproj.filters
regenerated build files with Introjucer
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Builds/VisualStudio2010/OwlNest.vcxproj
	Builds/VisualStudio2010/OwlNest.vcxproj.filters