lots of small changes, currently working on edit functionality (with double click)
Merge remote-tracking branch 'origin/master'