reorganized directories, removing unused jsps, changes in edti article, back button
Merge branch 'master' of https://github.com/jkamcc/magazine-spring