More changes (added some demos).
Merge branch 'master' of https://github.com/mafagafogigante/java-small-projects