Fixed the Spinner showing the categories when inserting so that we can specify the categories dynamically.
Merge remote-tracking branch 'origin/master'