heavy work in progress of local database
fixed merge conflict
Merge remote-tracking branch 'original/master'
Merge remote-tracking branch 'original/master'
fixed some weird merge conflict relicts in the source
more changes to the databases and model generation
Implemented the database and the asynch loading of the data, aswell as
saving the favorites to the database. TODO: decision from where to load
(web or database) + better error management in model creation + proper oberserver pattern between GUI and Model
Merge pull request #52 from NicolasKessler/master

Implemented the database and the asynch loading of the data, aswell as saving the favorites to the database. TODO: decision from where to load
(web or database) + better error management in model creation + proper oberserver pattern between GUI and Model
better error management for downloadingand some small enhancements
Merge pull request #53 from NicolasKessler/master

better error management for downloading and some small enhancements
Merge remote-tracking branch 'original/master'