Merge branch 'master' of github.com:Widecode/Javafolio
Merge branch 'master' of github.com:Widecode/Javafolio