added some logic for showing notes on right time
Merge branch 'development' of https://github.com/Wisheri/dmp-project into development