Merge master into database branch
Include updatetime in .json-data
Only fill specialframespanel once
Preload specialframes when Panel is opened
Fix bitlydata conflict
Merge pull request #56 from MaPePeR/merge-master-into-database

Merge master into database & more