Updated saving category for core data stacks. Added more default stacks.
Code cleanups.
Merge branch 'dev'