little cleaning
Merge branch 'master' of github.com:mplaza/veteranshowcase
merge conflicts resolved
Merge branch 'master' of github.com:mplaza/veteranshowcase