Catagories are now being included, but all these other changes should be reverted, including some of the migrations.
Fixed the logout/login issue
Catagories show up and can be added at create time
Catagory merge complete