added a error popup on  timeline when there is no db
making tests on layers
Merge branch 'master' into layersontimeline
fixed layers adding up on the get and on the timeline
Resolved conflicts