merge with new commit
add tomcat7 plugin to automate testing and deployment
Readded images, specifically the puzzle pieces, so that transition slides look pretty again
Changed require.js paths in html files to support the deletion of the client folder. Also deleted some unused/outdated html test files.