Changed the uri_matching document and deleted node Picasso
deleting a bunch of files
Updated the LinkRank and AbstractFinder servlets to return jsonp rather than plain json.
Merge branch 'development' of github.com:InformationIntegrationGroup/LinkedDataEduApp into development
more deletions + text changes
Revert "deleting a bunch of files"

This reverts commit 86a1b446dacd05d2307024c5c709b4045e0a4e6a.
deleting my unneccessary stuff again
actually deleting. wtf git
moar deletions
Merge branch 'development' of github.com:InformationIntegrationGroup/LinkedDataEduApp into development
Merge branch 'development' of github.com:InformationIntegrationGroup/LinkedDataEduApp into development
moving 'paper' out of src folder. why was this even in here in the first place??
Merge branch 'development' of github.com:InformationIntegrationGroup/LinkedDataEduApp into development
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.
adding mmlab stuff
deleting unneeded d3; updating paths
updating submodule