Merge remote-tracking branch 'upstream/master'
Added missing State option.
Merge remote-tracking branch 'upstream/master'
Merge pull request #221 from xtech86/master

Added missing STATE option for Custom Event Editing Layout.