Merge pull request #82 from juancjara/development

Development
Merge pull request #83 from juancjara/development

msg advance view
edit note
Merge remote-tracking branch 'upstream/master'
edit and min
Merge pull request #84 from andreqi/master

edit min and change of color in first page
Merge pull request #85 from juancjara/master

update dev