Not sure ho to deal with this
Merge branch 'unstable' of github.com:garrettoreilly/CharliePlugins into unstable

Conflicts:
	nbproject/private/private.xml