merged two development branches
basic UI done
TODO
clean up the development dir
implement all queries and selection on timeline