Merge conflict resolved. Updated settings to make NoobaPluginAPI a
static lib

Conflicts:
	NoobaPluginAPI/NoobaPluginAPI.pro
	NoobaPluginAPI/noobapluginapi.h
Merge branch 'unstable' of https://github.com/Asitha/NoobaVSS into unstable

Conflicts:
	NoobaPluginAPI/noobapluginapi.h