+ Made state defined values non-system so organizations can add/remove them. Fixes #349
Merge branch 'origin/release/Release-1.0.2'