?
Merge
DB fixes, ActionBar corrections and much more
Persistency now fully functional
Merge