Merge pull request #39 from alfeko/dmpbranch

Dmpbranch
Merge pull request #40 from alfeko/master

UI update
Add new note functionality
Merge pull request #43 from alfeko/dmpbranch

Dmpbranch
Merge pull request #45 from alfeko/alexbranch

Alexbranch
Merge pull request #46 from alfeko/master

merge master