Y U NO MERGE !?!?!?!
Updated the CabinDatabaseController to support ints instead of strings as states
Merge branch 'Enum'