Branch cleaning
Merge branch 'development' of github.com:ecanzonieri/JimbeSoftware into development